metanorma-iso 2.2.2 → 2.2.3

data/lib/metanorma/iso/biblio.rng

@@ -188,6 +188,11 @@
           <value>adapter</value>
           <value>translator</value>
           <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
         </choice>
       </attribute>
       <zeroOrMore>

data/lib/metanorma/iso/isodoc.rng

@@ -177,11 +177,7 @@
         </optional>
         <optional>
           <attribute name="style">
-            <choice>
-              <value>basic</value>
-              <value>full</value>
-              <value>short</value>
-            </choice>
+            <ref name="XrefStyleType"/>
           </attribute>
         </optional>
         <ref name="XrefBody"/>
@@ -1031,6 +1027,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1045,6 +1042,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1058,6 +1056,7 @@
             <ref name="PureTextElement"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1195,6 +1194,7 @@
       <ref name="add"/>
       <ref name="del"/>
       <ref name="span"/>
+      <ref name="erefstack"/>
     </choice>
   </define>
   <define name="add">
@@ -1202,6 +1202,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1214,6 +1215,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1278,6 +1280,7 @@
       </optional>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -1970,6 +1973,7 @@
       </element>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -2525,6 +2529,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
           <oneOrMore>
             <element name="coords">
@@ -2572,6 +2577,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
         </element>
       </zeroOrMore>
@@ -2620,6 +2626,15 @@
       <ref name="PureTextElement"/>
     </oneOrMore>
   </define>
+  <define name="XrefConnectiveType">
+    <choice>
+      <value>and</value>
+      <value>or</value>
+      <value>from</value>
+      <value>to</value>
+      <value/>
+    </choice>
+  </define>
   <define name="XrefTarget">
     <element name="location">
       <attribute name="target">
@@ -2628,16 +2643,35 @@
         </data>
       </attribute>
       <attribute name="connective">
-        <choice>
-          <value>and</value>
-          <value>or</value>
-          <value>from</value>
-          <value>to</value>
-          <value/>
-        </choice>
+        <ref name="XrefConnectiveType"/>
       </attribute>
     </element>
   </define>
+  <define name="XrefStyleType">
+    <choice>
+      <value>basic</value>
+      <value>full</value>
+      <value>short</value>
+      <value>id</value>
+    </choice>
+  </define>
+  <define name="erefTypeWithConnective">
+    <optional>
+      <attribute name="connective">
+        <ref name="XrefConnectiveType"/>
+      </attribute>
+    </optional>
+    <ref name="erefType"/>
+  </define>
+  <define name="erefstack">
+    <element name="erefstack">
+      <oneOrMore>
+        <element name="eref">
+          <ref name="erefTypeWithConnective"/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.2.2".freeze
+    VERSION = "2.2.3".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -25,9 +25,12 @@ Gem::Specification.new do |spec|
 
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
-  spec.files         = `git ls-files`.split("\n")
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
+  end
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-standoc", "~> 2.2.4"
   spec.add_dependency "mnconvert", "~> 1.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -289,10 +289,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
-- ".github/workflows/automerge.yml"
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
-- ".github/workflows/ubuntu.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
@@ -303,8 +299,6 @@ files:
 - LICENSE
 - Makefile
 - README.adoc
-- Rakefile
-- bin/rspec
 - lib/asciidoctor/iso/base.rb
 - lib/asciidoctor/iso/cleanup.rb
 - lib/asciidoctor/iso/converter.rb
@@ -402,83 +396,6 @@ files:
 - lib/relaton/render/config.yml
 - lib/relaton/render/general.rb
 - metanorma-iso.gemspec
-- spec/assets/header.html
-- spec/assets/html.css
-- spec/assets/htmlcover.html
-- spec/assets/htmlintro.html
-- spec/assets/i18n.yaml
-- spec/assets/iso.adoc
-- spec/assets/iso.headless.html
-- spec/assets/iso.xml
-- spec/assets/rice_image1.png
-- spec/assets/scripts.html
-- spec/assets/std.css
-- spec/assets/word.css
-- spec/assets/wordcover.html
-- spec/assets/wordintro.html
-- spec/examples/103_01_02.html
-- spec/examples/english.yaml
-- spec/examples/iso_123_.xml
-- spec/examples/iso_123_all_parts.xml
-- spec/examples/iso_123_no_year_note.xml
-- spec/examples/iso_124_.xml
-- spec/examples/iso_216_.xml
-- spec/examples/iso_iec_12382_.xml
-- spec/examples/rice.adoc
-- spec/examples/rice.preview.html
-- spec/examples/rice.sh
-- spec/examples/rice_img/1000-1_ed2amd3fig1a.png
-- spec/examples/rice_img/1000-1_ed2amd3fig1b.png
-- spec/examples/rice_img/1000-1_ed2amd3fig2.png
-- spec/examples/rice_img/1000-1_ed2amd3fig3.png
-- spec/examples/rice_img/1000-1_ed2amd3fig4.png
-- spec/examples/rice_img/1000-1_ed2amd3fig5_f.png
-- spec/examples/rice_img/1000-1_ed2amd3figA.png
-- spec/examples/rice_img/1000-1_ed2amd3figA1.png
-- spec/examples/rice_img/1000-1_ed2amd3figA2.png
-- spec/examples/rice_img/1000-1_ed2amd3figTab1.png
-- spec/examples/rice_img/1000-1_ed2amd3figTab2.png
-- spec/examples/rice_img/1001_ed2amd3fig1.png
-- spec/examples/rice_img/ISO_1213_1.png
-- spec/examples/rice_img/SL1000-1_ed2amd3fig1.png
-- spec/examples/rice_img/rice_image1.png
-- spec/examples/rice_img/rice_image2.png
-- spec/examples/rice_img/rice_image3_1.png
-- spec/examples/rice_img/rice_image3_2.png
-- spec/examples/rice_img/rice_image3_3.png
-- spec/isodoc/amd_spec.rb
-- spec/isodoc/blocks_spec.rb
-- spec/isodoc/i18n_spec.rb
-- spec/isodoc/inline_spec.rb
-- spec/isodoc/iso_spec.rb
-- spec/isodoc/metadata_spec.rb
-- spec/isodoc/postproc_spec.rb
-- spec/isodoc/ref_spec.rb
-- spec/isodoc/section_spec.rb
-- spec/isodoc/table_spec.rb
-- spec/isodoc/terms_spec.rb
-- spec/isodoc/word_dis_spec.rb
-- spec/isodoc/xref_spec.rb
-- spec/metanorma/amd_spec.rb
-- spec/metanorma/base_spec.rb
-- spec/metanorma/blank_spec.rb
-- spec/metanorma/blocks_spec.rb
-- spec/metanorma/cleanup_spec.rb
-- spec/metanorma/inline_spec.rb
-- spec/metanorma/lists_spec.rb
-- spec/metanorma/macros_spec.rb
-- spec/metanorma/processor_spec.rb
-- spec/metanorma/refs_spec.rb
-- spec/metanorma/section_spec.rb
-- spec/metanorma/table_spec.rb
-- spec/metanorma/validate_spec.rb
-- spec/relaton/render_spec.rb
-- spec/requirements/requirement_components_spec.rb
-- spec/requirements/requirements_spec.rb
-- spec/requirements/xref_spec.rb
-- spec/spec_helper.rb
-- spec/vcr_cassettes/docrels.yml
-- spec/vcr_cassettes/withdrawn_iso.yml
 homepage: https://github.com/metanorma/metanorma-iso
 licenses:
 - BSD-2-Clause
@@ -491,14 +408,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-iso lets you write ISO standards in AsciiDoc.

data/.github/workflows/automerge.yml

@@ -1,31 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-# source: https://github.com/marketplace/actions/merge-pull-requests#usage
-name: automerge
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - id: automerge
-        name: automerge
-        uses: "pascalgn/automerge-action@v0.15.3"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

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:
-  rake:
-    uses: metanorma/ci/.github/workflows/generic-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/.github/workflows/ubuntu.yml

@@ -1,41 +0,0 @@
-name: ubuntu
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup prerequisites
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install xsltproc
-
-      - run: make xsd_doc
-        env:
-          GITHUB_USERNAME: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - uses: actions/upload-artifact@master
-        with:
-          name: xsd_doc
-          path: xsd_doc
-
-  deploy-gh-pages:
-    if: github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-    - uses: actions/checkout@master
-
-    - uses: actions/download-artifact@master
-      with:
-        name: xsd_doc
-        path: xsd_doc
-

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/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/spec/assets/header.html

@@ -1,7 +0,0 @@
-
-/* an empty header */
-
-START DOC ID: {{ docnumber }}: END DOC ID
-
-FILENAME: {{ filename }}
-

data/spec/assets/html.css

@@ -1,2 +0,0 @@
-
-/* another empty stylesheet */

data/spec/assets/htmlcover.html

@@ -1,4 +0,0 @@
-
-/* an empty html cover page */
-
-

data/spec/assets/htmlintro.html

@@ -1,5 +0,0 @@
-
-/* an empty html intro page */
-
-<ul id="toc-list"></ul>
-

data/spec/assets/i18n.yaml

@@ -1,2 +0,0 @@
-foreword: Enkonduko
-

data/spec/assets/iso.adoc

@@ -1,10 +0,0 @@
-= X
-A
-:mn-document-class: iso
-:title-main-en: Medical devices — Quality management systems — Requirements for regulatory purposes
-:title-main-fr: Dispositifs médicaux — Systèmes de management de la qualité — Exigences à des fins réglementaires
-
-== Clause 1
-
-X
-

data/spec/assets/iso.headless.html

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<div xmlns:epub="http://www.idpf.org/2007/ops">
-  
-  
-    <div class="title-section">
-      <p>&#xA0;</p>
-    </div>
-    <br />
-    <div class="prefatory-section">
-      <p>&#xA0;</p>
-    </div>
-    <br />
-    <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
-      <br />
-      <div>
-        <h1 class="ForewordTitle">Foreword</h1>
-        <div id="" class="Note">
-          <p><span class="note_label">NOTE</span>&#xA0; These results are based on a study carried out on three different types of kernel.</p>
-        </div>
-      </div>
-      <p class="zzSTDTitle1"></p>
-    </main>
-  <script type="text/x-mathjax-config">
-  MathJax.Hub.Config({
-    asciimath2jax: {
-      delimiters: [['(#(', ')#)']]
-    }
- });
-</script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=AM_HTMLorMML"></script>
-
-</div>

data/spec/assets/iso.xml

@@ -1,71 +0,0 @@
-<iso-standard xmlns="https://www.metanorma.org/ns/iso">
-  <bibdata type="standard">
-    <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
-    <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
-    <title type="main" language="en" format="text/plain">Specifications and test methods</title>
-    <title type="title-part" language="en" format="text/plain">Rice</title>
-    <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
-    <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
-    <title type="title-part" language="fr" format="text/plain">Riz</title>
-  <docidentifier type="iso">ISO/PreCD3 17301-1</docidentifier>
-  <docidentifier type="iso-tc">17301</docidentifier>
-  <docnumber>1730</docnumber>
-  <date type="published"><on>2011</on></date>
-  <date type="accessed"><on>2012</on></date>
-  <date type="created"><from>2010</from><to>2011</to></date>
-  <date type="activated"><on>2013</on></date>
-  <date type="obsoleted"><on>2014</on></date>
-  <edition>2</edition>
-  <version>
-  <revision-date>2016-05-01</revision-date>
-  <draft>0.4</draft>
-</version>
-  <contributor>
-    <role type="author"/>
-    <organization>
-      <name>International Organization for Standardization</name>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <name>International Organization for Standardization</name>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-  <language>en</language>
-  <script>Latn</script>
-  <status>
-    <stage abbreviation="CD">35</stage>
-    <substage abbreviation="3CD">20</substage>
-    <iteration>3</iteration>
-  </status>
-  <copyright>
-    <from>2016</from>
-    <owner>
-      <organization>
-        <abbreviation>ISO</abbreviation>
-      </organization>
-    </owner>
-  </copyright>
-  <ext>
-  <doctype>international-standard</doctype>
-  <editorialgroup>
-    <technical-committee number="34">Food products</technical-committee>
-    <subcommittee number="4">Cereals and pulses</subcommittee>
-    <workgroup number="3">Rice Group</workgroup>
-    <secretariat>GB</secretariat>
-  </editorialgroup>
-  <structuredidentifier>
-    <project-number part="1">ISO/PreCD3 17301</project-number>
-  </structuredidentifier>
-  </ext>
-</bibdata>
-    <foreword>
-    <note>
-  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
-</note>
-    </foreword>
-    </iso-standard>
-

data/spec/assets/scripts.html

@@ -1,3 +0,0 @@
-<script>
-  This is > a script
-</script>

data/spec/assets/std.css

@@ -1,2 +0,0 @@
-
-/* a third empty stylesheet */

data/spec/assets/word.css

@@ -1,2 +0,0 @@
-
-/* one empty stylesheet */

data/spec/assets/wordcover.html

@@ -1,3 +0,0 @@
-
-/* an empty word cover page */
-

data/spec/assets/wordintro.html

@@ -1,4 +0,0 @@
-
-An empty word intro page.
-
-WORDTOC