isodoc 1.2.5 → 1.3.1

data/spec/isodoc/xref_spec.rb

@@ -2313,7 +2313,7 @@ OUTPUT
   <li id="N1"><p>A</p></li>
 </ol>
   <clause id="xyz"><title>Preparatory</title>
-     <ol id="N02">
+     <ol id="N02" type="arabic">
   <li id="N2"><p>A</p></li>
 </ol>
 </clause>
@@ -2321,17 +2321,17 @@ OUTPUT
     </preface>
     <sections>
     <clause id="scope" type="scope"><title>Scope</title>
-    <ol id="N0">
+    <ol id="N0" type="roman">
   <li id="N"><p>A</p></li>
 </ol>
     </clause>
     <terms id="terms"/>
     <clause id="widgets"><title>Widgets</title>
     <clause id="widgets1">
-    <ol id="note1l">
+    <ol id="note1l" type="alphabet">
   <li id="note1"><p>A</p></li>
 </ol>
-    <ol id="note2l">
+    <ol id="note2l" type="roman_upper">
   <li id="note2"><p>A</p></li>
 </ol>
     </clause>
@@ -2339,12 +2339,12 @@ OUTPUT
     </sections>
     <annex id="annex1">
     <clause id="annex1a">
-    <ol id="ANl">
+    <ol id="ANl" type="alphabet_upper">
   <li id="AN"><p>A</p></li>
 </ol>
     </clause>
     <clause id="annex1b">
-    <ol id="Anote1l">
+    <ol id="Anote1l" type="roman" start="4">
   <li id="Anote1"><p>A</p></li>
 </ol>
     <ol id="Anote2l">
@@ -2360,12 +2360,12 @@ OUTPUT
             <foreword>
               <p>
                 <xref target='N1'>Introduction, a)</xref>
-                <xref target='N2'>Preparatory, a)</xref>
-                <xref target='N'>Clause 1, a)</xref>
+                <xref target='N2'>Preparatory, 1)</xref>
+                <xref target='N'>Clause 1, i)</xref>
                 <xref target='note1'>Clause 3.1, List 1 a)</xref>
-                <xref target='note2'>Clause 3.1, List 2 a)</xref>
-                <xref target='AN'>Annex A.1, a)</xref>
-                <xref target='Anote1'>Annex A.2, List 1 a)</xref>
+                <xref target='note2'>Clause 3.1, List 2 I)</xref>
+                <xref target='AN'>Annex A.1, A)</xref>
+                <xref target='Anote1'>Annex A.2, List 1 iv)</xref>
                 <xref target='Anote2'>Annex A.2, List 2 a)</xref>
               </p>
             </foreword>
@@ -2377,7 +2377,7 @@ OUTPUT
               </ol>
               <clause id='xyz'>
                 <title depth='2'>Preparatory</title>
-                <ol id='N02'>
+                <ol id='N02' type="arabic">
                   <li id='N2'>
                     <p>A</p>
                   </li>
@@ -2392,7 +2392,7 @@ OUTPUT
   <tab/>
   Scope
 </title>
-              <ol id='N0'>
+              <ol id='N0' type="roman">
                 <li id='N'>
                   <p>A</p>
                 </li>
@@ -2408,12 +2408,12 @@ OUTPUT
   Widgets
 </title>
               <clause id='widgets1'><title>3.1.</title>
-                <ol id='note1l'>
+                <ol id='note1l' type="alphabet">
                   <li id='note1'>
                     <p>A</p>
                   </li>
                 </ol>
-                <ol id='note2l'>
+                <ol id='note2l' type="roman_upper">
                   <li id='note2'>
                     <p>A</p>
                   </li>
@@ -2428,14 +2428,14 @@ OUTPUT
   (informative)
 </title>
             <clause id='annex1a'><title>A.1.</title>
-              <ol id='ANl'>
+              <ol id='ANl' type="alphabet_upper">
                 <li id='AN'>
                   <p>A</p>
                 </li>
               </ol>
             </clause>
             <clause id='annex1b'><title>A.2.</title>
-              <ol id='Anote1l'>
+              <ol id='Anote1l' type="roman" start="4">
                 <li id='Anote1'>
                   <p>A</p>
                 </li>
@@ -2547,6 +2547,151 @@ OUTPUT
     OUTPUT
   end
 
+  it "cross-references bookmarks" do
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface>
+    <foreword>
+    <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
+    <xref target="N"/>
+    <xref target="note1"/>
+    <xref target="note2"/>
+    <xref target="AN"/>
+    <xref target="Anote1"/>
+    <xref target="Anote2"/>
+    </p>
+    </foreword>
+    <introduction id="intro">
+    <p id="N01">
+  <bookmark id="N1"/>
+</p>
+  <clause id="xyz"><title>Preparatory</title>
+     <p id="N02" type="arabic">
+  <bookmark id="N2"/>
+</p>
+</clause>
+    </introduction>
+    </preface>
+    <sections>
+    <clause id="scope" type="scope"><title>Scope</title>
+    <p id="N0" type="roman">
+  <bookmark id="N"/>
+</p>
+    </clause>
+    <terms id="terms"/>
+    <clause id="widgets"><title>Widgets</title>
+    <clause id="widgets1">
+    <p id="note1l" type="alphabet">
+  <bookmark id="note1"/>
+</p>
+    <p id="note2l" type="roman_upper">
+  <bookmark id="note2"/>
+</p>
+    </clause>
+    </clause>
+    </sections>
+    <annex id="annex1">
+    <clause id="annex1a">
+    <p id="ANl" type="alphabet_upper">
+  <bookmark id="AN"/>
+</p>
+    </clause>
+    <clause id="annex1b">
+    <p id="Anote1l" type="roman" start="4">
+  <bookmark id="Anote1"/>
+</p>
+    <p id="Anote2l">
+  <bookmark id="Anote2"/>
+</p>
+    </clause>
+    </annex>
+    </iso-standard>
+    INPUT
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword>
+             <p>
+               <xref target='N1'>Introduction</xref>
+               <xref target='N2'>Preparatory</xref>
+               <xref target='N'>Clause 1</xref>
+               <xref target='note1'>Clause 3.1</xref>
+               <xref target='note2'>Clause 3.1</xref>
+               <xref target='AN'>Annex A.1</xref>
+               <xref target='Anote1'>Annex A.2</xref>
+               <xref target='Anote2'>Annex A.2</xref>
+             </p>
+           </foreword>
+           <introduction id='intro'>
+             <p id='N01'>
+               <bookmark id='N1'/>
+             </p>
+             <clause id='xyz'>
+               <title depth='2'>Preparatory</title>
+               <p id='N02' type='arabic'>
+                 <bookmark id='N2'/>
+               </p>
+             </clause>
+           </introduction>
+         </preface>
+         <sections>
+           <clause id='scope' type='scope'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Scope
+             </title>
+             <p id='N0' type='roman'>
+               <bookmark id='N'/>
+             </p>
+           </clause>
+           <terms id='terms'>
+             <title>2.</title>
+           </terms>
+           <clause id='widgets'>
+             <title depth='1'>
+               3.
+               <tab/>
+               Widgets
+             </title>
+             <clause id='widgets1'>
+               <title>3.1.</title>
+               <p id='note1l' type='alphabet'>
+                 <bookmark id='note1'/>
+               </p>
+               <p id='note2l' type='roman_upper'>
+                 <bookmark id='note2'/>
+               </p>
+             </clause>
+           </clause>
+         </sections>
+         <annex id='annex1'>
+           <title>
+             <strong>Annex A</strong>
+             <br/>
+             (informative)
+           </title>
+           <clause id='annex1a'>
+             <title>A.1.</title>
+             <p id='ANl' type='alphabet_upper'>
+               <bookmark id='AN'/>
+             </p>
+           </clause>
+           <clause id='annex1b'>
+             <title>A.2.</title>
+             <p id='Anote1l' type='roman' start='4'>
+               <bookmark id='Anote1'/>
+             </p>
+             <p id='Anote2l'>
+               <bookmark id='Anote2'/>
+             </p>
+           </clause>
+         </annex>
+       </iso-standard>
+OUTPUT
+end
+
    it "realises subsequences" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
         <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/spec_helper.rb

@@ -29,6 +29,12 @@ def xmlpp(x)
   s
 end
 
+def metadata(x)
+  Hash[x.sort].delete_if{ |k, v| v.nil? || v.respond_to?(:empty?) && v.empty? }
+end
+
+#   expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
+
 def strip_guid(x)
   x.gsub(%r{ id="_[^"]+"}, ' id="_"').gsub(%r{ target="_[^"]+"}, ' target="_"').
     gsub(%r( href="#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{13}"), ' href="#_"').

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: twitter_cldr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: relaton-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -287,9 +315,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rubocop.ribose.yml"
@@ -326,6 +352,7 @@ files:
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
 - lib/isodoc/convert.rb
+- lib/isodoc/css.rb
 - lib/isodoc/function.rb
 - lib/isodoc/function/blocks.rb
 - lib/isodoc/function/blocks_example_note.rb
@@ -350,6 +377,7 @@ files:
 - lib/isodoc/html_function/postprocess.rb
 - lib/isodoc/i18n.rb
 - lib/isodoc/metadata.rb
+- lib/isodoc/metadata_contributor.rb
 - lib/isodoc/metadata_date.rb
 - lib/isodoc/pdf_convert.rb
 - lib/isodoc/presentation_function/bibdata.rb

data/.github/workflows/macos.yml

@@ -1,42 +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: Install Inkscape
-        run: |
-          brew cask install inkscape
-          inkscape --version
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,62 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-      - '*'
-  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: Install Inkscape
-        run: |
-          sudo add-apt-repository ppa:inkscape.dev/stable
-          sudo apt update
-          sudo apt install inkscape
-          inkscape --version
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake
-      - name: Trigger repositories
-        if: matrix.ruby == '2.6'
-        env:
-          GH_USERNAME: metanorma-ci
-          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          CLIENT_PAYLOAD=$(cat <<EOF
-          "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $REPOS
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done