metanorma-unece 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdb5f95d47c9db88bf4a33313dc66f5064eca19a5005165e539a393fed984534
-  data.tar.gz: efc6015774feab34665ca9e6e35b2331675b88710c8805e840dacae1f4cf6fb7
+  metadata.gz: 352d01ad18525916ccf5a2a6e21b0f1cb54decd593885d27eb9b6a674b274446
+  data.tar.gz: dc17fc5261824587942a86faf85c0657b82cd4833c75eef6e072492221845fac
 SHA512:
-  metadata.gz: e5d100882e8c8a963b0b568a3ca3ab287f2d2bd45f2c9152492d6d06357ffb493eb8db7caa8a705890fd0430bc78c1bc2b4fc5dd3a527291fe092ace741ef6bc
-  data.tar.gz: 8e7b0e98c4940fa509687463420f53f8d08bbabee615d65d928478b5b226df7f887a1fda82762afb2ea024eaeecdb7615622b9336b721877dd5d758aeb73fc23
+  metadata.gz: '01277995a30db07e9b0f94d45c0abd892b89ebe003f7507dea5918313df7a798ce2f4fcaf0fe11519ea50ae008626210d142bf05b96e5a6aa58da02eca8ec758'
+  data.tar.gz: 155d9a5a8c99542f40081370aa9edb818c8ec7728ff6dcf5aede463efb0e911691dc4551ecaf36ac83d33e8df69a40bca6fc7e610b6da6ac43d06db53d272715

data/.github/workflows/macos.yml

@@ -2,13 +2,14 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: macos
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,8 +21,15 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          sudo gem install bundler -v "~> 2" --force
+          sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
+      - name: Use Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '8'
+      - name: Install Puppeteer
+        run: |
+          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -2,13 +2,14 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: ubuntu
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,8 +21,15 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler 
           bundle install --jobs 4 --retry 3
+      - name: Use Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '8'
+      - name: Install Puppeteer
+        run: |
+          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/windows.yml

@@ -2,13 +2,14 @@
 # use ci-master https://github.com/metanorma/metanorma-build-scripts
 name: windows
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -21,10 +22,17 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler 
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3
+      - name: Use Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '8'
+      - name: Install Puppeteer
+        run: |
+          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake

data/README.adoc

@@ -131,6 +131,8 @@ repository.
 
 == Examples
 
-* link:spec/examples/plenary.adoc[] is the source file for the "`ECE/TRADE/C/CEFACT/2018/6`" plenary document.
-* link:spec/examples/rec42.adoc[] is the source file for Recommendation 42.
-* link:spec/examples/rfc6350.adoc[] is the UNECE version of https://tools.ietf.org/html/rfc6350[RFC 6350].
+* Example documents are avalable at the https://github.com/metanorma/mn-samples-unece[mn-samples-unece] repository.
+
+////
+* Document templates are available at the https://github.com/metanorma/mn-templates-unece[mn-templates-unece] repository.
+////

data/lib/asciidoctor/unece/basicdoc.rng

@@ -52,9 +52,9 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="BasicBlock"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="note"/>
     </zeroOrMore>
@@ -284,6 +284,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>
@@ -564,6 +567,7 @@
       <ref name="pagebreak"/>
       <ref name="bookmark"/>
       <ref name="image"/>
+      <ref name="index"/>
     </choice>
   </define>
   <define name="PureTextElement">
@@ -688,6 +692,17 @@
       <empty/>
     </element>
   </define>
+  <define name="index">
+    <element name="index">
+      <attribute name="primary"/>
+      <optional>
+        <attribute name="secondary"/>
+      </optional>
+      <optional>
+        <attribute name="tertiary"/>
+      </optional>
+    </element>
+  </define>
   <!-- bare ID element, used for referencing arbitrary spans of text -->
   <define name="bookmark">
     <element name="bookmark">

data/lib/asciidoctor/unece/biblio.rng

@@ -34,7 +34,7 @@
     </data>
   </define>
   <start>
-    <ref name="relaton_collection"/>
+    <ref name="bibitem"/>
   </start>
   <define name="status">
     <element name="status">
@@ -278,10 +278,12 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <ref name="orgname"/>
-      <optional>
+      <oneOrMore>
+        <ref name="orgname"/>
+      </oneOrMore>
+      <zeroOrMore>
         <ref name="subdivision"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="abbreviation"/>
       </optional>
@@ -357,6 +359,9 @@
   </define>
   <define name="phone">
     <element name="phone">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -1024,6 +1029,8 @@
       <value>correctedBy</value>
       <value>revises</value>
       <value>revisedBy</value>
+      <value>describes</value>
+      <value>describedBy</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/unece/isodoc.rng

@@ -207,9 +207,9 @@
     </optional>
     <choice>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -244,9 +244,9 @@
     </optional>
     <choice>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -289,9 +289,9 @@
       </optional>
       <choice>
         <group>
-          <optional>
+          <zeroOrMore>
             <ref name="BasicBlock"/>
-          </optional>
+          </zeroOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>

data/lib/asciidoctor/unece/isostandard.rng

@@ -6,7 +6,9 @@
     </start>
     <define name="organization">
       <element name="organization">
-        <ref name="orgname"/>
+        <oneOrMore>
+          <ref name="orgname"/>
+        </oneOrMore>
         <optional>
           <ref name="abbreviation"/>
         </optional>
@@ -74,10 +76,12 @@
     <define name="sections">
       <element name="sections">
         <ref name="clause"/>
-        <choice>
-          <ref name="term-clause"/>
-          <ref name="terms"/>
-        </choice>
+        <optional>
+          <choice>
+            <ref name="term-clause"/>
+            <ref name="terms"/>
+          </choice>
+        </optional>
         <optional>
           <ref name="definitions"/>
         </optional>
@@ -395,6 +399,7 @@
         </optional>
         <choice>
           <ref name="image"/>
+          <ref name="pre"/>
           <oneOrMore>
             <ref name="subfigure"/>
           </oneOrMore>

data/lib/isodoc/unece/html/unece.scss

@@ -43,7 +43,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
 	text-align:left;
 	mso-pagination:widow-orphan;
 	tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-	font-size:10.0pt;
+	font-size:10.5pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Courier New";

data/lib/metanorma/unece/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Unece
-    VERSION = "0.2.9"
+    VERSION = "0.2.10"
   end
 end

data/metanorma-unece.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-standoc", "~> 1.3.0"
   spec.add_dependency "isodoc", "~> 1.0.0"
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-unece
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement