metanorma-ietf 3.6.8 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17bcabceaa3266e27009fca291f497dbda0bac6f31d48e9cb4aeb51653721682
-  data.tar.gz: 29a033f30aebf8a6c9b5127178617e2049696067746014d482145190309ff3ee
+  metadata.gz: aeb0c94430f5b3ed24a329a89529c6921e7ca6074426f804bbf6691976282269
+  data.tar.gz: a479f966ab1f10d217afd1b4340131f5fe7d2d83f79d8e50f67bf2cb0e4d7ff9
 SHA512:
-  metadata.gz: f897268efa4c788332b8cd18f4d63c67094263bf1030028f01124209ddbf21778ffc1a3cb8bf82a70e550cd5ddbab216ff10a64316385c6eee7771185a986472
-  data.tar.gz: 4babd7a444518b0a712d06265c23040da702ff4d707d2f1dea4d2af90913e61bdff952d44405e0761dc0c9b2b263c8336d467b093b053a1e8850a07992a2db89
+  metadata.gz: e758b0d51003ed797dbc6d9972535d8946ddf47a9c640f9f076e1db5991d414b3d87aee4c3a60a84cc902b02fd2abf35e647921c20297403f6feca543587dfac
+  data.tar.gz: 3a0fe42165b028986bf7e6cdd77768ff554507e83f9bad29bc6ebd633439ff9b3c07917235bb5ac966bd5445f0e94c6770e6284ac2034cf841a573a0ea60c9b6

data/lib/isodoc/ietf/blocks.rb

@@ -118,9 +118,9 @@ module IsoDoc
 
       def formula_parse(node, out)
         formula_parse1(node, out)
-        formula_where(node.at(ns("./dl")), out)
+        formula_where(node.at(ns("./key")), out)
         node.children.each do |n|
-          %w(stem dl).include? n.name and next
+          %w(stem dl key).include? n.name and next
           parse(n, out)
         end
       end
@@ -213,6 +213,16 @@ module IsoDoc
       end
 
       def toc_parse(_node, _out); end
+
+      def key_parse(node, out)
+        node.children.each do |n|
+          if n.name == "name"
+            key_name_parse(n, out)
+            "<p keep-with-next='true'><strong>#{@i18n.key}</strong></p>"
+          else parse(n, out)
+          end
+        end
+      end
     end
   end
 end

data/lib/isodoc/ietf/inline.rb

@@ -96,17 +96,8 @@ module IsoDoc
           alt: node["alt"] }
       end
 
-      def image_parse(node, out, caption)
+      def image_parse(node, out)
         out.artwork **attr_code(image_parse_attrs(node))
-        image_title_parse(out, caption)
-      end
-
-      def image_title_parse(out, caption)
-        unless caption.nil?
-          out.t align: "center", keepWithPrevious: "true" do |p|
-            p << caption.to_s
-          end
-        end
       end
 
       def svg_parse(node, out)

data/lib/isodoc/ietf/table.rb

@@ -18,7 +18,7 @@ module IsoDoc
       end
 
       def table_parse_tail(node, out)
-        (dl = node.at(ns("./dl"))) && parse(dl, out)
+        (key = node.at(ns("./key"))) && parse(key, out)
         node.xpath(ns("./source")).each { |n| parse(n, out) }
         node.xpath(ns("./note")).each { |n| parse(n, out) }
       end

data/lib/metanorma/ietf/basicdoc.rng

@@ -208,11 +208,15 @@ Applicable to modify and delete</a:documentation>
     </zeroOrMore>
     <optional>
       <element name="newcontent">
-        <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
+        <a:documentation>New content to be added to the document; applicable to add and modify.
+Can be blocks and/or sections</a:documentation>
         <ref name="OptionalId"/>
         <zeroOrMore>
           <ref name="BasicBlock"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="section"/>
+        </zeroOrMore>
       </element>
     </optional>
     <zeroOrMore>

data/lib/metanorma/ietf/blocks.rb

@@ -8,6 +8,7 @@ module Metanorma
                     "keep-with-previous": node.attr("keepWithPrevious") ||
                            node.attr("keep-with-previous"),
                     indent: node.attr("indent"),
+                    key: node.option?("key") ? "true" : nil,
                   ))
       end
 
@@ -35,6 +36,7 @@ module Metanorma
                     newline: node.attr("newline"),
                     indent: node.attr("indent"),
                     spacing: node.attr("spacing"),
+                    key: node.option?("key") ? "true" : nil,
                   ))
       end
 

data/lib/metanorma/ietf/cleanup.rb

@@ -1,6 +1,10 @@
 module Metanorma
   module Ietf
-    class Converter < ::Metanorma::Standoc::Converter
+    class Cleanup < ::Metanorma::Standoc::Cleanup
+      def copied_instance_variables
+        super + %i[bcp_bold]
+      end
+
       def cleanup(xmldoc)
         bcp14_cleanup(xmldoc)
         abstract_cleanup(xmldoc)
@@ -12,9 +16,8 @@ module Metanorma
 
       def boilerplate_isodoc(xmldoc)
         x = xmldoc.dup
-        x.root.add_namespace(nil, xml_namespace)
-        # xml = Nokogiri::XML(x.to_xml)
-        @isodoc ||= isodoc(@lang, @script, @locale)
+        x.root.add_namespace(nil, @conv.xml_namespace)
+        @isodoc ||= @conv.isodoc(@lang, @script, @locale)
         # initialise @isodoc.xrefs, for @isodoc.xrefs.info
         @isodoc
       end
@@ -102,6 +105,8 @@ module Metanorma
       def section_names_refs_cleanup(xml); end
 
       def note_cleanup(xmldoc); end
+
+      def norm_ref_preface(sect, isodoc); end
     end
   end
 end

data/lib/metanorma/ietf/converter.rb

@@ -1,10 +1,8 @@
 require "asciidoctor"
-require "metanorma/standoc/converter"
+require "metanorma-standoc"
 require "isodoc/ietf/rfc_convert"
 require_relative "./front"
 require_relative "./blocks"
-require_relative "./validate"
-require_relative "./cleanup"
 require_relative "./macros"
 
 module Metanorma
@@ -31,12 +29,16 @@ module Metanorma
         super
       end
 
+      def cache_workgroup(_node)
+        Metanorma::Ietf::Data::WORKGROUPS
+      end
+
       def outputs(node, ret)
         File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
         rfc_converter(node).convert("#{@filename}.xml")
       end
 
-      def init_misc(node)
+      def init_metadata(node)
         super
         @default_doctype = "internet-draft"
       end
@@ -121,8 +123,6 @@ module Metanorma
         [t, rel]
       end
 
-      def norm_ref_preface(sect, isodoc); end
-
       def clause_attrs_preprocess(attrs, node)
         attrs[:numbered] = node.attr("numbered")
         attrs[:removeInRFC] = node.attr("removeInRFC")
@@ -179,6 +179,7 @@ module Metanorma
 
       def isodoc(lang, script, locale, i18nyaml = nil)
         conv = rfc_converter(EmptyAttr.new)
+        conv.init_i18n({ i18nyaml:, language: lang, script:, locale: })
         i18n = conv.i18n_init(lang, script, locale, i18nyaml)
         conv.metadata_init(lang, script, locale, i18n)
         conv

data/lib/metanorma/ietf/isodoc.rng

@@ -167,12 +167,6 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
     </define>
     <define name="DlAttributes">
       <ref name="BlockAttributes"/>
-      <optional>
-        <attribute name="key">
-          <a:documentation>This definition list is the key of a figure or formula</a:documentation>
-          <data type="boolean"/>
-        </attribute>
-      </optional>
     </define>
     <define name="DlBody">
       <optional>
@@ -311,7 +305,7 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure     </a:documentation>
+        <a:documentation>Content of the figure</a:documentation>
         <ref name="image">
           <a:documentation>by default the content of a figure is a media file</a:documentation>
         </ref>
@@ -340,8 +334,8 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </zeroOrMore>
       <optional>
-        <ref name="dl">
-          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        <ref name="key">
+          <a:documentation>An key defining any symbols used in the figure</a:documentation>
         </ref>
       </optional>
       <zeroOrMore>
@@ -365,7 +359,7 @@ and is intended to be referenced by a callout within the source code</a:document
         </ref>
       </optional>
       <choice>
-        <a:documentation>Content of the figure     </a:documentation>
+        <a:documentation>Content of the figure</a:documentation>
         <ref name="image-no-id">
           <a:documentation>by default the content of a figure is a media file</a:documentation>
         </ref>
@@ -429,7 +423,7 @@ in order to be applicable in this standardisation document</a:documentation>
       </element>
     </define>
     <define name="sourcecodebody">
-      <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
+      <a:documentation>The computer code or other such text presented in the block, as a single unformatted string.
 (The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
       <element name="body">
         <oneOrMore>
@@ -549,7 +543,7 @@ normative or informative references, some split references into sections organiz
           <choice>
             <a:documentation>Table cell contains a block</a:documentation>
             <ref name="paragraph-with-footnote"/>
-            <ref name="dl"/>
+            <ref name="key"/>
             <ref name="ul"/>
             <ref name="ol"/>
             <ref name="figure"/>
@@ -632,8 +626,40 @@ This is done if the footnote reference is already presented in some other form,
         <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
     </define>
+    <define name="FormulaBody">
+      <ref name="stem">
+        <a:documentation>The content of the formula, as a mathematical expression</a:documentation>
+      </ref>
+      <optional>
+        <ref name="key">
+          <a:documentation>A key defining any symbols used in the formula</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="key">
+    <a:documentation>Key to a table, figure, or formula</a:documentation>
+    <element name="key">
+      <optional>
+        <ref name="tname">
+          <a:documentation>optional title of key</a:documentation>
+        </ref>
+      </optional>
+      <oneOrMore>
+        <choice>
+          <a:documentation>Definition list and/or paragraph content</a:documentation>
+          <ref name="dl"/>
+          <ref name="paragraph"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -1042,7 +1068,7 @@ parargaph sources are currently only rendered in metanorma-plateau</a:documentat
       </optional>
       <optional>
         <attribute name="custom-charset">
-          <a:documentation>Character set that the contained text belongs to; 
+          <a:documentation>Character set that the contained text belongs to;
 is used in particular to capture mutually agreed definitions of codepoints in Unicode Private Use Area</a:documentation>
         </attribute>
       </optional>
@@ -1623,7 +1649,7 @@ numbers</a:documentation>
   <define name="definitions">
     <a:documentation>One or more definition lists, used to define symbols and abbreviations used in the remainder of the document.
 These can also be used as glossaries, with simple definitions, in contrast to the more elaborate definitions given in
-terms sections </a:documentation>
+terms sections</a:documentation>
     <element name="definitions">
       <ref name="OptionalId"/>
       <ref name="LocalizedStringAttributes"/>
@@ -1864,7 +1890,7 @@ used in document amendments</a:documentation>
       </zeroOrMore>
       <zeroOrMore>
         <ref name="related">
-          <a:documentation>Zero or more names which are related to the term being defined. </a:documentation>
+          <a:documentation>Zero or more names which are related to the term being defined.</a:documentation>
         </ref>
       </zeroOrMore>
       <optional>
@@ -2025,7 +2051,7 @@ used in document amendments</a:documentation>
     <element name="letter-symbol">
       <optional>
         <attribute name="isInternational">
-          <a:documentation>Whether the designation is the same across languages, or language-specific   </a:documentation>
+          <a:documentation>Whether the designation is the same across languages, or language-specific</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
@@ -2632,6 +2658,11 @@ links within an SVG file, so that the SVG file can hyperlink to anchors within t
         <a:documentation>Connective linking this location to its predecessor. _from/to_ are presumed to nest more closely than _and_ or _or_</a:documentation>
         <ref name="XrefConnectiveType"/>
       </attribute>
+      <optional>
+        <attribute name="custom-connective">
+          <a:documentation>Custom wording for connnective linking this location to its predecessor, custom wording. If provided, is treated as equivalent semantically to connective value</a:documentation>
+        </attribute>
+      </optional>
     </element>
   </define>
   <define name="XrefStyleType">
@@ -2658,6 +2689,11 @@ links within an SVG file, so that the SVG file can hyperlink to anchors within t
         <ref name="XrefConnectiveType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="custom-connective">
+        <a:documentation>Custom wording for connnective linking this location to its predecessor, custom wording. If provided, is treated as equivalent semantically to connective value</a:documentation>
+      </attribute>
+    </optional>
     <ref name="erefType"/>
   </define>
   <define name="erefstack">

data/lib/metanorma/ietf/validate.rb

@@ -3,7 +3,11 @@ require "metanorma-utils"
 
 module Metanorma
   module Ietf
-    class Converter < ::Metanorma::Standoc::Converter
+    class Validate < ::Metanorma::Standoc::Validate
+      def copied_instance_variables
+        super + %i[workgroups]
+      end
+
       def content_validate(doc)
         super
         image_validate(doc)
@@ -42,10 +46,6 @@ module Metanorma
       def schema_file
         "ietf.rng"
       end
-
-      def cache_workgroup(_node)
-        Metanorma::Ietf::Data::WORKGROUPS
-      end
     end
   end
 end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.6.8".freeze
+    VERSION = "3.7.1".freeze
   end
 end

data/lib/metanorma-ietf.rb

@@ -4,6 +4,8 @@ require "vectory"
 
 require_relative "metanorma/ietf"
 require_relative "metanorma/ietf/converter"
+require_relative "metanorma/ietf/cleanup"
+require_relative "metanorma/ietf/validate"
 require_relative "isodoc/ietf/rfc_convert"
 
 Metanorma::Registry.instance.register(Metanorma::Ietf::Processor)

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 3.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.3.1"
   spec.add_dependency "relaton-render"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.6.8
+  version: 3.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-01 00:00:00.000000000 Z
+date: 2026-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement