metanorma-ietf 3.0.12 → 3.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 873ffa398b400f3f0188c99cf1283ae24074f79f74f8757b88b65bbe44a4d8f6
-  data.tar.gz: 5b4d877eb0e92ec31335828982d3a42e579c3bff8cfaf476dab7cafd54f9e30b
+  metadata.gz: 39ea21861ccd96e10a9c03dcfa3672df68347437aed1c307680160a402195b4b
+  data.tar.gz: effa7116f2bf9f02e880e9fd2d478ef140aa45b520dc14d083dd1c6f409dad0f
 SHA512:
-  metadata.gz: 24cf62a1815e74d14e62ba8cb090f5ea9415ffe4c0e5261403bab3de76bc894311e279eac549f68635c02f33621c296a2d4b1e812bfd2802b1945c949847a683
-  data.tar.gz: 5991493ac2c13acc90215ef46388bf0e0cfa0fead0b10d030a2816086bc2ff1854034fb23d7fa44e5d6ecd2fa7413d368a127729273962428d37c8e23a50ab05
+  metadata.gz: bdba57407ebf106d7ca311d94dfee3e778e6f1453de5a09772d42e1f696c6b951be24d2b84764d623fe8d9e3b81d192930881b6c9ed2619a630c30c0b52addce
+  data.tar.gz: f57b8315d127c4f7dacbd295d6a899855d5d4df1ee262a9e0d993b38126c82f8b4c4c7d22529895b0351a44303efb0f8107b2ed2d0d76b4d027e2790db9a900b

data/lib/metanorma/ietf/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/ietf/cleanup.rb

@@ -58,7 +58,7 @@ module Metanorma
         xmldoc
       end
 
-      def xref_to_eref(xref)
+      def xref_to_eref(xref, name)
         super
         xref.delete("format")
       end
@@ -77,7 +77,7 @@ module Metanorma
             x["uri"] = x["target"]
             x.delete("target")
           else
-            xref_to_eref(x)
+            xref_to_eref(x, "source")
           end
         end
       end

data/lib/metanorma/ietf/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/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.0.12".freeze
+    VERSION = "3.0.13".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -28,12 +28,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{^(bin|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 "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.0.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 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: mathml2asciimath
@@ -223,9 +223,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/automerge.yml"
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
@@ -236,7 +233,6 @@ files:
 - Guardfile
 - LICENSE
 - README.adoc
-- Rakefile
 - lib/isodoc/ietf/SVG-1.2-RFC.rng
 - lib/isodoc/ietf/blocks.rb
 - lib/isodoc/ietf/cleanup.rb
@@ -290,14 +286,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-ietf lets you write IETF documents, such as Internet-Drafts and

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,16 +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/xml2rfc-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,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec