isodoc 1.2.4 → 1.3.0

data/spec/isodoc/table_spec.rb

@@ -65,7 +65,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>
              <table id='tableD-1' alt='tool tip' summary='long desc' width='70%' keep-with-next='true' keep-lines-together='true'>

data/spec/isodoc/terms_spec.rb

@@ -74,7 +74,7 @@ RSpec.describe IsoDoc do
     INPUT
 
     presxml = <<~"PRESXML"
-       <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'>

data/spec/isodoc/xref_spec.rb

@@ -14,7 +14,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>
@@ -167,7 +167,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>
@@ -377,7 +377,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>
@@ -546,7 +546,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>
@@ -684,7 +684,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>
@@ -844,7 +844,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>
@@ -1002,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>
       <p>
@@ -1162,7 +1162,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>
@@ -1322,7 +1322,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>
@@ -1465,7 +1465,7 @@ OUTPUT
     </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>
@@ -1656,7 +1656,7 @@ OUTPUT
     </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>
@@ -1831,7 +1831,7 @@ OUTPUT
     </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>
@@ -1976,7 +1976,7 @@ OUTPUT
        </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>
@@ -2191,7 +2191,7 @@ OUTPUT
     </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>
@@ -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">
@@ -2355,17 +2355,17 @@ OUTPUT
     </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>
                 <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>
@@ -2491,7 +2491,7 @@ OUTPUT
     </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>
@@ -2592,7 +2592,7 @@ OUTPUT
   </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>
@@ -2710,7 +2710,7 @@ INPUT
   </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>

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.4
+  version: 1.3.0
 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: 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,8 +377,10 @@ 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
 - lib/isodoc/presentation_function/block.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/section.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