metanorma-ietf 3.0.8 → 3.0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71679f9a6d5e530d891b8c56b4353846fd3be9fff356e2aeb9efee7ab21b5b68
-  data.tar.gz: 801f308896032b32cc194292ab0c44b9b624ce616e1155b5957bc83fa9bbb217
+  metadata.gz: 30a82e668dc96f4e303356f3f04bedcada52d358a35e2d7b28000402cbc1696a
+  data.tar.gz: fee5dd82281153cb759cb087519880bd7374460c09927abadeadf84d09de2d39
 SHA512:
-  metadata.gz: c406406aa3a034082595dcea77a43ddf55e55a7463033180216d3820b31449182af81e9c1dede1cc99ee944c27ad33359a7feb0df9170793e186af157cbaa640
-  data.tar.gz: 2439758d94f9966ced0e48a5970ec68e6083afc9f308832cc2529d86b555d84595f86b64569a233ebe8b3487ca98f59bfa0b76842b538b6dfafc1cebeaab12c9
+  metadata.gz: 7db6cc698dce0d1fd826e724b6e1ee68d9e9cce5a0f52492cdddc0853fbfe204c2a4b67d6d9a96b1087e8fb560693fcf197cb169dff6cb2d304472854df21b8b
+  data.tar.gz: fef70127a965f3a628d824ccdf4819a160866801eab03e9919072383c62c20599715f283dbec55e467f817ec99979509b58f4620cae3bdc7f54b623eaccff5a0

data/.github/workflows/rake.yml

@@ -11,6 +11,6 @@ on:
 
 jobs:
   rake:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/xml2rfc-rake.yml@main
+    uses: metanorma/ci/.github/workflows/xml2rfc-rake.yml@main
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+# 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/lib/isodoc/ietf/reqt.rb

@@ -1,81 +1,34 @@
 module IsoDoc
   module Ietf
     class RfcConvert < ::IsoDoc::Convert
-      def recommendation_labels(node)
-        [node.at(ns("./label")), node.at(ns("./title")),
-         @xrefs.anchor(node["id"], :label, false)]
-      end
-
-      def recommendation_name(node, out, type)
-        label, title, lbl = recommendation_labels(node)
-        out.t **{ keepWithNext: "true" } do |b|
-          b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
-        end
-        if label || title
-          out.t **{ keepWithNext: "true" }  do |b|
-            label and label.children.each { |n| parse(n, b) }
-            b << "#{clausedelim} " if label && title
-            title and title.children.each { |n| parse(n, b) }
-          end
+      def recommendation_name(node, out)
+        out.t **{ keepWithNext: "true" } do |p|
+          node.children.each { |n| parse(n, p) }
         end
       end
 
-      def recommendation_attributes(node, out)
-        ret = recommendation_attributes1(node)
-        return if ret.empty?
-
-        out.ul do |p|
-          ret.each do |l|
-            p.li do |i|
-              i.em { |_e| i << l }
-            end
-          end
-        end
+      def recommendation_parse(node, out)
+        recommendation_parse1(node, out)
       end
 
-      def recommendation_parse(node, out)
-        recommendation_name(node, out, @i18n.recommendation)
-        recommendation_attributes(node, out)
+      def recommendation_parse1(node, out)
+        recommendation_name(node.at(ns("./name")), out)
         node.children.each do |n|
-          parse(n, out) unless %w(label title).include? n.name
+          parse(n, out) unless n.name == "name"
         end
       end
 
       def requirement_parse(node, out)
-        recommendation_name(node, out, @i18n.requirement)
-        recommendation_attributes(node, out)
-        node.children.each do |n|
-          parse(n, out) unless %w(label title).include? n.name
-        end
+        recommendation_parse1(node, out)
       end
 
       def permission_parse(node, out)
-        recommendation_name(node, out, @i18n.permission)
-        recommendation_attributes(node, out)
-        node.children.each do |n|
-          parse(n, out) unless %w(label title).include? n.name
-        end
-      end
-
-      def inline?(node)
-        return true if node.first_element_child.nil?
-
-        %w(em link eref xref strong tt sup sub strike keyword smallcap
-           br hr bookmark pagebreak stem origin term preferred admitted
-           deprecates domain termsource modification)
-          .include? node.first_element_child.name
+        recommendation_parse1(node, out)
       end
 
-      def requirement_component_parse(node, out)
-        return if node["exclude"] == "true"
-
-        if inline?(node)
-          out.t do |p|
-            p << "INHERIT: " if node.name == "inherit"
-            node.children.each { |n| parse(n, p) }
-          end
-        else
-          node.children.each { |n| parse(n, out) }
+      def div_parse(node, out)
+        node.children.each do |n|
+          parse(n, out)
         end
       end
     end

data/lib/isodoc/ietf/rfc_convert.rb

@@ -17,8 +17,7 @@ module IsoDoc
   module Ietf
     class RfcConvert < ::IsoDoc::Convert
       def convert1(docxml, _filename, _dir)
-        @xrefs.parse docxml
-        info docxml, nil
+        document_preprocess(docxml)
         ret = noko do |xml|
           xml.rfc **attr_code(rfc_attributes(docxml)) do |html|
             make_link(html, docxml)
@@ -30,6 +29,20 @@ module IsoDoc
         set_pis(docxml, Nokogiri::XML(ret))
       end
 
+      def document_preprocess(docxml)
+        @isodoc.reqt_models = Metanorma::Requirements
+          .new({ default: "default", lang: @lang, script: @script,
+                 labels: @i18n.get })
+        info docxml, nil
+        @xrefs.parse docxml
+        @isodoc.xrefs = @xrefs
+        @isodoc.permission(docxml)
+        @isodoc.requirement(docxml)
+        @isodoc.recommendation(docxml)
+        @isodoc.requirement_render(docxml)
+        @xrefs.parse docxml
+      end
+
       def metadata_init(lang, script, i18n)
         @meta = Metadata.new(lang, script, i18n)
       end

data/lib/metanorma/ietf/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/lib/metanorma/ietf/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -116,6 +127,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="suppress_identifier">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <ref name="BibliographicItem"/>
       </element>
     </define>
@@ -1269,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -2488,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/metanorma/ietf/reqt.rng

@@ -108,7 +108,7 @@
     </element>
   </define>
   <define name="label">
-    <element name="label">
+    <element name="identifier">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.0.8".freeze
+    VERSION = "3.0.10.1".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.10.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +224,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
@@ -278,7 +279,7 @@ homepage: https://github.com/metanorma/metanorma-ietf
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -293,8 +294,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and
   RFCs, in AsciiDoc.