metanorma-ietf 3.7.0 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5676e734dfefc19937ce0ea3b404be286e148d9c60d7a121be3454037580f85
-  data.tar.gz: 5acf46a8f76721ab10b94f715b62a885e2d8ad8f6b205656292dfad12105ee43
+  metadata.gz: 4acaa7041e3570f621487bf11a90fbb9a7ce3c61a28c9b5cf3bdd6670d13385a
+  data.tar.gz: cd4d014264eb4ece508434c80d9281f6a02499e709a5b1f440ce92fd5b697504
 SHA512:
-  metadata.gz: 804ffce50d693bba414590f64b6a1a4bbc2dd26300ed95098205b8406dbb0ebfa4b4016d590e37d9cbac6bd6d7f0c48e982d5f7611ae9efea6ff03d8ca2c60d7
-  data.tar.gz: d77dac9cb000a5d5f9ede0a70492b2ea88ae266f8516f34989c982e0686258a17cc2e6081606f38a19f02d145aedbc244f49e15bddffc5f5e0aa2f15d4c484ca
+  metadata.gz: 821c60fd2b044b020e08caff4042aa635c92e06cea9af3f1e8a6b5ac138672165e7aed5ba4065d1bb3448eeaac24156428c6770020d72865a70eba0a02a3a138
+  data.tar.gz: e50961575ebb2f7f45e7590aabdcb266d48d803852ddfccd823c2d2327f3c79b24c52306a382aa7c3e3a9c5e816bf4933eb94168ca911a0767eb87e16e188dfe

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/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/biblio.rng

@@ -1939,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

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")

data/lib/metanorma/ietf/isodoc.rng

@@ -641,8 +641,85 @@ This is done if the footnote reference is already presented in some other form,
         </ref>
       </zeroOrMore>
     </define>
+    <define name="altsource">
+      <a:documentation>Alternative file to use as media</a:documentation>
+      <element name="altsource">
+        <ref name="MediaAttributes"/>
+        <optional>
+          <attribute name="tag">
+            <a:documentation>Comma-delimited tag to indicate when the alternate file is to be used, 
+at minimum allows contain `html`, `doc`, `pdf` as the main target formats of Metanorma,
+and `default` for the fallback. The presence of an altsource tagged `default` is required</a:documentation>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="media">
+            <a:documentation>CSS media query to indicate when the alternate file is to be used</a:documentation>
+          </attribute>
+        </optional>
+      </element>
+    </define>
+    <define name="image">
+      <a:documentation>Container for image content</a:documentation>
+      <choice>
+        <element name="image">
+          <ref name="RequiredId"/>
+          <ref name="ImageAttributes">
+            <a:documentation>When specified along with altsource, ImageAttributes give the default image to be rendered</a:documentation>
+          </ref>
+          <ref name="ImageBody"/>
+        </element>
+        <element name="svg">
+          <a:documentation>Add svg mark up to image</a:documentation>
+          <oneOrMore>
+            <choice>
+              <text/>
+              <ref name="AnyElement"/>
+            </choice>
+          </oneOrMore>
+        </element>
+      </choice>
+    </define>
+    <define name="ImageAttributes">
+      <optional>
+        <ref name="MediaAttributes">
+          <a:documentation>If the image contains altsource, the media attributes are given on each of the altsource elements instead of the root node</a:documentation>
+        </ref>
+      </optional>
+      <ref name="MediaAccessibilityAttributes"/>
+      <optional>
+        <attribute name="width">
+          <a:documentation>Height of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="height">
+          <a:documentation>Width of image</a:documentation>
+          <ref name="ImageSize"/>
+        </attribute>
+      </optional>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="ImageBody">
+    <optional>
+      <element name="svg">
+        <a:documentation>image can contain SVG XML, which is used to access its identifiers within the Metanorma XML</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="altsource">
+        <a:documentation>Alternative files to use as media</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="key">
     <a:documentation>Key to a table, figure, or formula</a:documentation>
     <element name="key">
@@ -930,34 +1007,6 @@ titlecase, or lowercase</a:documentation>
       <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
-  <define name="image" combine="choice">
-    <choice>
-      <element name="image">
-        <ref name="RequiredId"/>
-        <ref name="ImageAttributes"/>
-        <optional>
-          <element name="svg">
-            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
-            <oneOrMore>
-              <choice>
-                <text/>
-                <ref name="AnyElement"/>
-              </choice>
-            </oneOrMore>
-          </element>
-        </optional>
-      </element>
-      <element name="svg">
-        <a:documentation>Add svg mark up to image</a:documentation>
-        <oneOrMore>
-          <choice>
-            <text/>
-            <ref name="AnyElement"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </choice>
-  </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">
       <a:documentation>Bibliographic source for the information in the paragraph

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.7.0".freeze
+    VERSION = "3.7.2".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.3.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.7.0
+  version: 3.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-16 00:00:00.000000000 Z
+date: 2026-03-16 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.3.0
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement