metanorma-ietf 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c10eeb240c73eb23dc86cb68f2a74f8931b3e350f68ee763a23256a56795bae
-  data.tar.gz: ee6a1934c755a258adef52e1689eb462297fa34be3a8deb5923ed1da34b945b7
+  metadata.gz: a1deb99aa6937a5ecea906469cd404152a74945e6e6fb595262c52358841bc53
+  data.tar.gz: 0cd0c817dffcc423b00043479704a63851807d0e1aa0ea77856c80871e6d11df
 SHA512:
-  metadata.gz: 89f9bc46f9a5d31116b36402279e8e41db7a23a012368d11acab85c9f87d6e71eb200a327a3f54b3e88e0df2efb997324462eea853996d9a46dc7e78861f09c6
-  data.tar.gz: fa040fe15ba9e856a3fdb5645c7d06773f288a2dd36414772e04f087ccb2acfc52dc13dfc2564025b7b4e9bc3ad0f8eba3b62c1d8a66fef699b186fd3d1e18fd
+  metadata.gz: 5ee37a0a08b9f25e7aea0a381e383e154dadff6fd0bd9196cf375b7a4e3b199f327426e9f210452bf1ae4513220e4a7b6f1790d67aaf6e4a409134772fa1888b
+  data.tar.gz: 4d1df87114db20f71ba28f2fea1f254f8bfb47a03db1269b8e6db1d0a10013dcd44f164a493f5c8b3409e0e1f311b2b7eb7d65dfe84401d70da76fbd13bb441d

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/init.rb

@@ -4,8 +4,9 @@ require_relative "i18n"
 module IsoDoc
   module Ietf
     module Init
-      def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
+      def i18n_init(lang, script, locale, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, locale: locale,
+                                       i18nyaml: i18nyaml || @i18nyaml)
       end
 
       def fileloc(loc)

data/lib/isodoc/ietf/rfc_convert.rb

@@ -32,7 +32,7 @@ module IsoDoc
       def document_preprocess(docxml)
         @isodoc.reqt_models = Metanorma::Requirements
           .new({ default: "default", lang: @lang, script: @script,
-                 labels: @i18n.get })
+                 locale: @locale, labels: @i18n.get })
         info docxml, nil
         @xrefs.parse docxml
         @isodoc.xrefs = @xrefs
@@ -43,8 +43,8 @@ module IsoDoc
         @xrefs.parse docxml
       end
 
-      def metadata_init(lang, script, i18n)
-        @meta = Metadata.new(lang, script, i18n)
+      def metadata_init(lang, script, locale, i18n)
+        @meta = Metadata.new(lang, script, locale, i18n)
       end
 
       def xref_init(lang, script, klass, i18n, options)
@@ -105,7 +105,7 @@ module IsoDoc
         @format = :rfc
         @suffix = "rfc.xml"
         @isodoc = IsoDoc::PresentationXMLConvert.new({})
-        @isodoc.i18n_init("en", "Latn")
+        @isodoc.i18n_init("en", "Latn", nil, nil)
       end
 
       include ::IsoDoc::Ietf::Init

data/lib/metanorma/ietf/biblio.rng

@@ -73,8 +73,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +99,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +145,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -225,9 +237,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 +259,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 +276,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -647,6 +662,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -738,6 +756,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -851,6 +872,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -879,6 +909,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -927,6 +958,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/lib/metanorma/ietf/converter.rb

@@ -166,10 +166,10 @@ module Metanorma
         IsoDoc::Ietf::RfcConvert.new(html_extract_attributes(node))
       end
 
-      def isodoc(lang, script, i18nyaml = nil)
+      def isodoc(lang, script, locale, i18nyaml = nil)
         conv = rfc_converter(EmptyAttr.new)
-        i18n = conv.i18n_init(lang, script, i18nyaml)
-        conv.metadata_init(lang, script, i18n)
+        i18n = conv.i18n_init(lang, script, locale, i18nyaml)
+        conv.metadata_init(lang, script, locale, i18n)
         conv
       end
     end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.0.10".freeze
+    VERSION = "3.0.11".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.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
 
   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.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mathml2asciimath
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
 - !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.