metanorma-ietf 3.5.4 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d6ea179af9c4c095b3e4cb4481ee8cfe136d370e10df652b025c99dd61018f
-  data.tar.gz: 980f41496222a49f993ad5c12aa83fab68e192787ee93b1995631be4f5af29f0
+  metadata.gz: b2bbef6e584be1dd783e7737b1e05b43a6ed524acc3cd3affb2edbe407d3417b
+  data.tar.gz: '097b2d98f09a4ff356b7000ba0ccb683194c36a8edfbb9c39895a314f663da68'
 SHA512:
-  metadata.gz: 69381efde5d13a2b9453e94ab74d7557fc938295d88cde9b8db80e5229ce306f1c61b90f23887c985dc28e0f61ee2556b96353b6f475a1941a11366800e667d3
-  data.tar.gz: b03c83fe7b56285eb7ce5884861837274824d3a7bf9d1d5dfb474e1cf8e39a355c3059b293ee311f8c4571f0a53e64f8074e91bae901d87853f8efe4819f2094
+  metadata.gz: aab2b309ce5d38c345ffd952fdcbcc07f723b35b2d3d31a2be9301ed0a390d31a8991c83aa6500ec47cfd1b11004f3ef99961ab89f7509168547b281685dc578
+  data.tar.gz: 55d97a53151343f37471913d54ee369f847bce6eff6fceb160980e5025a257714a992790562eab342d9be92c071fcbe9ee42309b1185514c14b79bf5698762b7

data/lib/isodoc/ietf/inline.rb

@@ -3,54 +3,54 @@ module IsoDoc
     class RfcConvert < ::IsoDoc::Convert
       def em_parse(node, out)
         out.em do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def sup_parse(node, out)
         out.sup do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def sub_parse(node, out)
         out.sub do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def tt_parse(node, out)
         out.tt do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def strong_parse(node, out)
         out.strong do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def bcp14_parse(node, out)
         out.bcp14 do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def display_text_parse(node, out)
-        node.children.each { |n| parse(n, out) }
+        children_parse(node, out)
       end
 
       def strike_parse(node, out)
-        node.children.each { |n| parse(n, out) }
+        children_parse(node, out)
       end
 
       def smallcap_parse(node, out)
-        node.children.each { |n| parse(n, out) }
+        children_parse(node, out)
       end
 
       def keyword_parse(node, out)
-        node.children.each { |n| parse(n, out) }
+        children_parse(node, out)
       end
 
       def text_parse(node, out)
@@ -65,8 +65,8 @@ module IsoDoc
                when "MathML"
                  a = node.at(ns("./asciimath"))&.remove
                  a&.children&.text ||
-                 Plurimath::Math
-                 .parse(node.children.to_xml, "mathml").to_asciimath
+                   Plurimath::Math
+                     .parse(node.children.to_xml, "mathml").to_asciimath
                else HTMLEntities.new.encode(node.text)
                end
         out << "#{@openmathdelim} #{stem} #{@closemathdelim}"
@@ -85,7 +85,7 @@ module IsoDoc
       def semx_link_parse(node, out)
         out.eref **attr_code(target: node["target"],
                              brackets: node["style"]) do |l|
-          node.children.each { |n| parse(n, l) }
+          children_parse(node, l)
         end
       end
 
@@ -183,7 +183,11 @@ module IsoDoc
       end
 
       def span_parse(node, out)
-        children_parse(node, out)
+        if node["class"] == "bcp14"
+          bcp14_parse(node, out)
+        else
+          children_parse(node, out)
+        end
       end
     end
   end

data/lib/isodoc/ietf/rfc_convert.rb

@@ -67,7 +67,7 @@ module IsoDoc
 
       def error_parse(node, out)
         case node.name
-        when "bcp14" then bcp14_parse(node, out)
+        when "bcp14" then bcp14_parse(node, out) # legacy
         when "concept" then concept_parse(node, out)
         when "display-text" then display_text_parse(node, out)
         when "verbal-definition", "non-verbal-representation",

data/lib/metanorma/ietf/cleanup.rb

@@ -43,12 +43,11 @@ module Metanorma
                       "NOT RECOMMENDED", "OPTIONAL"].freeze
 
       def bcp14_cleanup(xmldoc)
-        return unless @bcp_bold
-
+        @bcp_bold or return
         xmldoc.xpath("//strong").each do |s|
-          next unless BCP_KEYWORDS.include?(s.text)
-
-          s.name = "bcp14"
+          BCP_KEYWORDS.include?(s.text) or next
+          s["class"] = "bcp14"
+          s.name = "span"
         end
       end
 

data/lib/metanorma/ietf/converter.rb

@@ -56,14 +56,19 @@ module Metanorma
           when :latexmath then stem_parse(node.text, xml, :latexmath, node)
           else
             case node.role
-            when "bcp14" then xml.bcp14 { |s| s << node.text.upcase }
-            else
-              xml << node.text
+            when "bcp14" then bcp14(node, xml)
+            else xml << node.text
             end
           end
         end
       end
 
+      def bcp14(node, xml)
+        xml.span **{ class: "bcp14" } do |s|
+          s << node.text.upcase
+        end
+      end
+
       def inline_anchor_xref(node)
         f, c = xref_text(node)
         f1, c = eref_text(node) if f.nil?
@@ -119,14 +124,14 @@ module Metanorma
 
       def norm_ref_preface(sect); end
 
-      def clause_parse(attrs, xml, node)
+      def clause_attrs_preprocess(attrs, node)
         attrs[:numbered] = node.attr("numbered")
         attrs[:removeInRFC] = node.attr("removeInRFC")
         attrs[:toc] = node.attr("toc")
         super
       end
 
-      def annex_parse(attrs, xml, node)
+      def annex_attrs_preprocess(attrs, node)
         attrs[:numbered] = node.attr("numbered")
         attrs[:removeInRFC] = node.attr("removeInRFC")
         attrs[:toc] = node.attr("toc")

data/lib/metanorma/ietf/ietf.rng

@@ -100,11 +100,6 @@
         <ref name="note"/>
       </zeroOrMore>
     </define>
-    <define name="ReviewAttributes" combine="interleave">
-      <optional>
-        <attribute name="display"/>
-      </optional>
-    </define>
     <define name="NoteAttributes">
       <optional>
         <attribute name="removeInRFC"/>
@@ -126,19 +121,6 @@
         <attribute name="align"/>
       </optional>
     </define>
-    <define name="ImageAttributes" combine="interleave">
-      <optional>
-        <attribute name="align"/>
-      </optional>
-    </define>
-    <define name="SourceAttributes" combine="interleave">
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="markers"/>
-      </optional>
-    </define>
     <define name="xref">
       <element name="xref">
         <attribute name="target">
@@ -185,17 +167,6 @@
         <ref name="erefTypeURI"/>
       </element>
     </define>
-    <define name="TableAttributes" combine="interleave">
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="align"/>
-      </optional>
-      <optional>
-        <attribute name="width"/>
-      </optional>
-    </define>
     <define name="Clause-Section">
       <ref name="Section-Attributes"/>
       <optional>
@@ -288,18 +259,30 @@
         <ref name="index-tertiary"/>
       </element>
     </define>
+    <define name="TextElement" combine="choice">
+      <ref name="review"/>
+    </define>
   </include>
   <!-- end overrides -->
-  <define name="TextElement" combine="choice">
-    <choice>
-      <ref name="bcp14"/>
-      <ref name="review"/>
-    </choice>
+  <define name="ReviewAttributes" combine="interleave">
+    <optional>
+      <attribute name="display"/>
+    </optional>
   </define>
-  <define name="bcp14">
-    <element name="bcp14">
-      <text/>
-    </element>
+  <define name="ImageAttributes" combine="interleave">
+    <optional>
+      <attribute name="align"/>
+    </optional>
+  </define>
+  <define name="SourceAttributes" combine="interleave">
+    <optional>
+      <attribute name="markers"/>
+    </optional>
+  </define>
+  <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="align"/>
+    </optional>
   </define>
   <define name="erefTypeURI">
     <optional>

data/lib/metanorma/ietf/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.0.3 -->
+<!-- VERSION v2.0.4 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -1328,6 +1328,7 @@ numbers</a:documentation>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
+          <ref name="executivesummary"/>
         </choice>
       </oneOrMore>
     </element>
@@ -1351,6 +1352,11 @@ numbers</a:documentation>
       <ref name="Content-Section"/>
     </element>
   </define>
+  <define name="executivesummary">
+    <element name="executivesummary">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="indexsect">
     <element name="indexsect">
       <ref name="Content-Section"/>
@@ -1576,6 +1582,15 @@ used in document amendments</a:documentation>
   <define name="annex">
     <element name="annex">
       <ref name="Annex-Section"/>
+      <zeroOrMore>
+        <ref name="annex-appendix"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="annex-appendix">
+    <a:documentation>Appendix, distinct subclause type for annexes (annex to annex, rather than subclause to annex)</a:documentation>
+    <element name="appendix">
+      <ref name="Clause-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.5.4".freeze
+    VERSION = "3.5.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.5.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 2025-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data