metanorma-mpfd 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe25d175fbbce0af7c7989b3f6ff4d2e88aa20b23e0474c036a2c318df12cac1
-  data.tar.gz: ea4a9d7eacf4343f76d0bd65d0b38432fa4d3c74fbf7521ed1df448f24f74d41
+  metadata.gz: 3e11960ae048767077604a782b32fef4338ae8f0a204ec4435c2b7aafa840d37
+  data.tar.gz: 4b5016636a6bf975e496862a19ad816339fa27d8ce325147b57dcdb63f7b8e77
 SHA512:
-  metadata.gz: f5ea55c55e12294eaf4a47ec1feb1d499fcb85d7b01bcfe71dd559db32f33469761be4308b21bc6c42ff83d05bed4cd23110a1a28deabc979e8bac1140c7da0c
-  data.tar.gz: 921f646f4dc82094df61836cf1e02219e0ad630a9076523626b11c8972b9549d32c3f6a22558d8c3c44bb2bc2bcefab3fec2e047cd14b4735b4a07c87a2233b8
+  metadata.gz: a43d5254a3dfde0e4128672c8c0a58892feb41b45afe7c9790e45639d8f4638d39470c6ba2cf502de935b863b27469830fc40314893c64e8231b7a0a1c1e66ca
+  data.tar.gz: '09042e2caf38abcd466b4d28f3a7be3691621a7fe68726f6fb1db289c1c96d1550ab3fbb63e770c213afc16d025d8740a2d502a62642cfc478c95fd8393cd4a6'

data/.github/workflows/macos.yml

@@ -0,0 +1,34 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: macos
+
+on: [push]
+
+jobs:
+  test-macos:
+    name: Test on Ruby ${{ matrix.ruby }} macOS
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          sudo gem install bundler -v "~> 2" --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

@@ -0,0 +1,34 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: ubuntu
+
+on: [push]
+
+jobs:
+  test-linux:
+    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          gem install bundler -v "~> 2"
+          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

@@ -0,0 +1,37 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
+name: windows
+
+on: [push]
+
+jobs:
+  test-windows:
+    name: Test on Ruby ${{ matrix.ruby }} Windows
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        shell: pwsh
+        run: |
+          gem install bundler -v "~> 2"
+          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/lib/asciidoctor/mpfd/basicdoc.rng

@@ -443,6 +443,9 @@
       <optional>
         <attribute name="subsequence"/>
       </optional>
+      <optional>
+        <ref name="tname"/>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>

data/lib/asciidoctor/mpfd/isodoc.rng

@@ -44,6 +44,27 @@
         </oneOrMore>
       </element>
     </define>
+    <define name="references">
+      <element name="references">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="section-title"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="bibitem"/>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
   <define name="standard-document">
     <element name="standard-document">

data/lib/isodoc/mpfd/base_convert.rb

@@ -171,7 +171,7 @@ module IsoDoc
         @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
                                    xref: "#{@annex_lbl} #{num}", level: 1 }
         i = 0
-        clause.xpath(ns("./clause")).each do |c|
+        clause.xpath(ns("./clause | ./references")).each do |c|
           container_names(c, 0)
           i = annex_naming(c, num, 1, i)
         end
@@ -182,7 +182,7 @@ module IsoDoc
         clause["container"] or @anchors[clause["id"]] = 
           { label: num, xref: "#{@annex_lbl} #{num}", level: level }
         i = 0
-        clause.xpath(ns("./clause")).each do |c|
+        clause.xpath(ns("./clause | ./references")).each do |c|
           i = annex_naming(c, num, level, i)
         end
       end

data/lib/metanorma/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Mpfd
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfd
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -244,16 +244,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
 - README.adoc
 - Rakefile
-- appveyor.yml
 - bin/console
 - bin/manifest
 - bin/rspec

data/.travis.yml

@@ -1,22 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-language: ruby
-cache: bundler
-os:
-- linux
-- osx
-rvm:
-- 2.6
-- 2.5
-- 2.4
-- ruby-head
-before_install: 
-- nvm install 8
-- npm install -g puppeteer
-- npm install
-- gem install bundler -v "~> 2"
-- bundle update
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-

data/appveyor.yml

@@ -1,37 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-version: '{build}'
-
-cache:
-  - vendor/bundle
-
-environment:
-  matrix:
-    - RUBY_VERSION: 26
-    - RUBY_VERSION: 25
-    - RUBY_VERSION: 24
-    - RUBY_VERSION: _trunk
-
-matrix:
-  allow_failures:
-    - RUBY_VERSION: _trunk
-
-install:
-  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
-  - refreshenv
-
-build_script:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - set GIT_TERMINAL_PROMPT=0
-  - gem install bundler -v "~> 2"
-  - bundle config --local path vendor/bundle
-  - bundle update
-  - bundle install
-
-before_test:
-  - ruby -v
-  - gem -v
-  - bundle -v
-
-test_script:
-  - bundle exec rake