metanorma-un 0.9.10 → 0.9.12

data/lib/metanorma/un/un.rng

@@ -5,6 +5,7 @@
     we cannot have a new default namespace: we will end up with a grammar with two different
     namespaces, one for isostandard and one for csand additions. And we do not want that.
   -->
+  <include href="relaton-un.rng"/>
   <include href="isodoc.rng">
     <start>
       <ref name="un-standard"/>
@@ -14,6 +15,7 @@
         <text/>
         <ref name="em"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="strong"/>
         <ref name="stem"/>
         <ref name="sub"/>
@@ -81,28 +83,6 @@
         </zeroOrMore>
       </element>
     </define>
-    <define name="DocumentType">
-      <choice>
-        <value>recommendation</value>
-        <value>plenary</value>
-        <value>addendum</value>
-        <value>communication</value>
-        <value>corrigendum</value>
-        <value>reissue</value>
-        <value>agenda</value>
-        <value>budgetary</value>
-        <value>sec-gen-notes</value>
-        <value>expert-report</value>
-        <value>resolution</value>
-      </choice>
-    </define>
-    <define name="editorialgroup">
-      <element name="editorialgroup">
-        <oneOrMore>
-          <ref name="committee"/>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="sections">
       <element name="sections">
         <oneOrMore>
@@ -113,32 +93,6 @@
         </oneOrMore>
       </element>
     </define>
-    <define name="BibDataExtensionType">
-      <optional>
-        <ref name="doctype"/>
-      </optional>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="submissionlanguage"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="editorialgroup"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="distribution"/>
-      </optional>
-      <optional>
-        <ref name="session"/>
-      </optional>
-      <optional>
-        <ref name="job_number"/>
-      </optional>
-    </define>
     <define name="preface">
       <element name="preface">
         <optional>
@@ -253,99 +207,6 @@
       </group>
     </define>
   </include>
-  <define name="session">
-    <element name="session">
-      <optional>
-        <ref name="session-number"/>
-      </optional>
-      <optional>
-        <ref name="session-date"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="item-number"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="item-name"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="subitem-name"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="collaborator"/>
-      </optional>
-      <optional>
-        <ref name="agenda-id"/>
-      </optional>
-      <optional>
-        <ref name="item-footnote"/>
-      </optional>
-    </element>
-  </define>
-  <define name="committee">
-    <element name="committee">
-      <text/>
-    </element>
-  </define>
-  <define name="session-number">
-    <element name="number">
-      <text/>
-    </element>
-  </define>
-  <define name="session-date">
-    <element name="session-date">
-      <data type="date"/>
-    </element>
-  </define>
-  <define name="item-number">
-    <element name="item-number">
-      <text/>
-    </element>
-  </define>
-  <define name="collaborator">
-    <element name="collaborator">
-      <text/>
-    </element>
-  </define>
-  <define name="agenda-id">
-    <element name="agenda-id">
-      <text/>
-    </element>
-  </define>
-  <define name="item-name">
-    <element name="item-name">
-      <text/>
-    </element>
-  </define>
-  <define name="subitem-name">
-    <element name="subitem-name">
-      <text/>
-    </element>
-  </define>
-  <define name="item-footnote">
-    <element name="item-footnote">
-      <text/>
-    </element>
-  </define>
-  <define name="submissionlanguage">
-    <element name="submissionlanguage">
-      <text/>
-    </element>
-  </define>
-  <define name="distribution">
-    <element name="distribution">
-      <choice>
-        <value>general</value>
-        <value>limited</value>
-        <value>restricted</value>
-        <value>provisional</value>
-      </choice>
-    </element>
-  </define>
-  <define name="job_number">
-    <element name="job_number">
-      <text/>
-    </element>
-  </define>
   <define name="un-standard">
     <element name="un-standard">
       <attribute name="version"/>

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.9.10".freeze
+    VERSION = "0.9.12".freeze
   end
 end

data/metanorma-un.gemspec

@@ -19,12 +19,13 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "iso-639"
   spec.add_dependency "roman-numerals"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -216,8 +216,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -225,10 +223,6 @@ files:
 - Gemfile
 - LICENSE
 - README.adoc
-- Rakefile
-- bin/console
-- bin/rspec
-- bin/setup
 - lib/isodoc/un.rb
 - lib/isodoc/un/base_convert.rb
 - lib/isodoc/un/html/header.html
@@ -262,12 +256,14 @@ files:
 - lib/metanorma/un.rb
 - lib/metanorma/un/UN_emblem_blue.svg
 - lib/metanorma/un/basicdoc.rng
+- lib/metanorma/un/biblio-standoc.rng
 - lib/metanorma/un/biblio.rng
 - lib/metanorma/un/boilerplate.xml
 - lib/metanorma/un/converter.rb
 - lib/metanorma/un/input.rb
 - lib/metanorma/un/isodoc.rng
 - lib/metanorma/un/processor.rb
+- lib/metanorma/un/relaton-un.rng
 - lib/metanorma/un/reqt.rng
 - lib/metanorma/un/un.rng
 - lib/metanorma/un/validate.rb
@@ -285,14 +281,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Metanorma for UN.

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  notify:
-    uses: metanorma/ci/.github/workflows/mn-processor-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,24 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: release
-
-on:
-  workflow_dispatch:
-    inputs:
-      next_version:
-        description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
-        required: true
-        default: 'skip'
-  push:
-    tags: [ v* ]
-
-jobs:
-  release:
-    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
-    with:
-      next_version: ${{ github.event.inputs.next_version }}
-    secrets:
-      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-

data/Rakefile

@@ -1,8 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "isodoc/gem_tasks"
-
-IsoDoc::GemTasks.install
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "metanorma/unece"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/rspec

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
-  "../../Gemfile", Pathname.new(__FILE__).realpath
-)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here