metanorma-gb 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c27e01906bc7f45a2522a6dadb628c21f42fe739e4d021b74cf24608206e139
-  data.tar.gz: 42d290af815bcdff9abe51617e5155cd998ba5bc4cc86612bcd7aa1ce21b8280
+  metadata.gz: aa05f8bf06951b8946e1afd845994998671639afeee7d8b1d43440cd7018482f
+  data.tar.gz: 16d11618fee5ea6be6f1fe005a21d12ae139a89fc2b0da08dc42f1cb33267d6d
 SHA512:
-  metadata.gz: 290f59692da3555e3931c032699597d6b94ab1e576ad3cd36926d3dee736581eb9602c2a50e7cd6f996693c7d76d89e7a7c3e99dc68a16c4a9d7ee29a7d83b98
-  data.tar.gz: 5c34001ed6f8d57856ed1fda99c47a8ee0d2db7d7fcd872aa0d77ce31bd6d1fd085744ac052f2f3ecf2c4413546bd814b70f045422b86e66655c02036957b3f5
+  metadata.gz: 1645f269ef3e8467e699e4ea8800e3ae62a5b816ae4dbbe3c157bfe773d6414a2b46f3eaf34afe341a72fc143237279ac1db8793ce3f97f0c828f9f832f818fb
+  data.tar.gz: 223e4d2f52db3c8389f7ecd062504b123505a93bc169c981227f10ea1f1cc5c24c1993e8e7c95cb198c8fb96f5e6bc11befc7f3dd0e38bd48c7959565e691955

data/.github/workflows/macos.yml

@@ -0,0 +1,27 @@
+# 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: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,27 @@
+# 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: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/windows.yml

@@ -0,0 +1,30 @@
+# 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: Run specs
+        run: |
+          bundle exec rake

data/lib/asciidoctor/gb/basicdoc.rng

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

data/lib/asciidoctor/gb/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/gb/gbbaseconvert.rb

@@ -216,11 +216,21 @@ module IsoDoc
         end
       end
 
+       def example_span_label(node, div, name)
+      n = get_anchors[node["id"]]
+      div.span **{ class: "example_label" } do |p|
+        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
+          l10n("#{@example_lbl} #{n[:label]}")
+        p << l10n(lbl + ":")
+        name and !lbl.nil? and p << "&nbsp;&mdash; "
+        name and name.children.each { |n| parse(n, div) }
+      end
+    end
+
       def example_p_parse(node, div)
+        name = node&.at(ns("./name"))&.remove
         div.p do |p|
-          p.span **{ class: "example_label" } do |s|
-            s << example_label(node)
-          end
+          example_span_label(node, p, name)
           insert_tab(p, 1)
           node.first_element_child.children.each { |n| parse(n, p) }
         end
@@ -229,17 +239,24 @@ module IsoDoc
 
       def example_parse1(node, div)
         div.p do |p|
-          p.span **{ class: "example_label" } do |s|
-            s << example_label(node)
-          end
+          example_span_label(node, p, node.at(ns("./name")))
           insert_tab(p, 1)
         end
-        node.children.each { |n| parse(n, div) }
+        node.children.each { |n| parse(n, div) unless n.name == "name" }
+      end
+
+      def node_begins_with_para(node)
+        node.elements.each do |e|
+          next if e.name == "name"
+          return true if e.name == "p"
+          return false
+        end
+        false
       end
 
       def example_parse(node, out)
         out.div **{ id: node["id"], class: "example" } do |div|
-          if node.first_element_child.name == "p"
+          if node_begins_with_para(node)
             example_p_parse(node, div)
           else
             example_parse1(node, div)

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.3"
+    VERSION = "1.3.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 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: metanorma-iso
@@ -247,17 +247,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
 - README.adoc
 - Rakefile
-- appveyor.yml
 - asciidoctor-gb.gemspec.old
 - bin/console
 - bin/rspec

data/.travis.yml

@@ -1,18 +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: 
-- 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