metanorma-ietf 3.4.2 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83a0728840ef2d5d5a7ace72f4bc2dfff97a85b6213e73511e15fd303313440f
-  data.tar.gz: 600e41fd0c3559f1b53ed072e6dc54905c049c3a41655ca2355af9451d0573d3
+  metadata.gz: b1ba51cb30f9a763118cd067b90a81ae8425ad6943c9c270daf87ba3d043de92
+  data.tar.gz: a54742db1f6423d43d44dfc4388539ffb9da6e709c5d8b7f16954d2a0536eba8
 SHA512:
-  metadata.gz: 92d3d375108c3d6f441c9070a9c1bd454d8471f92b3fb6fddaaeff9c4f8f15b2fc06cdd46c907ff9fbf2d619632a9551c8d75dac8ad2866fb0994f79841edde7
-  data.tar.gz: f6740373061b304cbda897852a632686eb7675394d179d6ee05ad9bca4b0d1031b0cb45e0a371f5a41490e820b63079dedca33e318ae94d5ede1ca2ea34259d5
+  metadata.gz: c2a0a4d158e1c8cf8ecacc4eec7f27e17033f14782c6ba5c8aac1be90da247d475ebce115499957ae8641546af02cc76e27cc2b3b4bc5a9c06de9782a68e385f
+  data.tar.gz: 3f2a5457aba6280d50be9f63d5555b33d04da66f098edb7af4dd150e345df380de7c16de43252c4180c65637ebe7d3da42f1f9ae427a698da43df3ae3cefc232

data/lib/isodoc/ietf/blocks.rb

@@ -86,6 +86,19 @@ module IsoDoc
         end
       end
 
+      def li_parse(node, out)
+        out.li **attr_code(anchor: node["id"]) do |li|
+          if node["uncheckedcheckbox"] == "true"
+            li << '<span class="zzMoveToFollowing">' \
+                  '<input type="checkbox" checked="checked"/></span>'
+          elsif node["checkedcheckbox"] == "true"
+            li << '<span class="zzMoveToFollowing">' \
+                  '<input type="checkbox"/></span>'
+          end
+          node.children.each { |n| parse(n, li) }
+        end
+      end
+
       def note_label(node)
         n = @xrefs.get[node["id"]]
         n.nil? || n[:label].nil? || n[:label].empty? and

data/lib/isodoc/ietf/inline.rb

@@ -58,7 +58,10 @@ module IsoDoc
 
       def stem_parse(node, out)
         stem = case node["type"]
-               when "MathML" then Plurimath::Math
+               when "MathML"
+                 a = node.at(ns("./asciimath"))&.remove
+                 a&.children&.text ||
+                 Plurimath::Math
                  .parse(node.children.to_xml, "mathml").to_asciimath
                else HTMLEntities.new.encode(node.text)
                end

data/lib/isodoc/ietf/terms.rb

@@ -5,6 +5,10 @@ module IsoDoc
         @termdomain = termdomain
       end
 
+      def semx_definition_parse(node, out)
+        definition_parse(node, out)
+      end
+
       def definition_parse(node, out)
         node.children.each { |n| parse(n, out) }
       end
@@ -15,6 +19,10 @@ module IsoDoc
         para.children.each { |n| parse(n, out) }
       end
 
+      def semx_deprecated_term_parse(node, out)
+        deprecated_term_parse(node, out)
+      end
+
       def deprecated_term_parse(node, out)
         name = node.at(ns(".//name"))
         out.t do |p|
@@ -22,6 +30,10 @@ module IsoDoc
           name.children.each { |c| parse(c, p) }
         end
       end
+      
+      def semx_admitted_term_parse(node, out)
+        admitted_term_parse(node, out)
+      end
 
       def admitted_term_parse(node, out)
         name = node.at(ns(".//name"))
@@ -30,6 +42,10 @@ module IsoDoc
         end
       end
 
+      def semx_term_parse(node, out)
+        term_parse(node, out)
+      end
+
       def term_parse(node, out)
         if domain = node.at(ns("./domain"))
           set_termdomain(domain.text)
@@ -53,10 +69,20 @@ module IsoDoc
           set_termdomain("")
         end
         node.xpath(ns("./definition")).size > 1 and
-          @isodoc.multidef(node)
+          multidef(node)
         clause_parse(node, out)
       end
 
+      def multidef(elem)
+        d = elem.at(ns("./definition"))
+      d = d.replace("<ol><li>#{to_xml(d.children)}</li></ol>").first
+      elem.xpath(ns("./definition")).each do |f|
+        f = f.replace("<li>#{to_xml(f.children)}</li>").first
+        d << f
+      end
+      d.wrap("<definition></definition>")
+      end
+
       def termdocsource_parse(_node, _out); end
 
       def concept_parse(node, out)
@@ -106,6 +132,10 @@ module IsoDoc
         end
       end
 
+      def semx_termref_parse(node, out)
+        termref_parse(node, out)
+      end
+
       def termref_parse(elem, out)
         preprocess_termref(elem)
         elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")

data/lib/metanorma/ietf/biblio.rng

@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>
@@ -1271,17 +1277,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.4.2".freeze
+    VERSION = "3.4.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.4
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data
@@ -298,7 +298,7 @@ homepage: https://github.com/metanorma/metanorma-ietf
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -314,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and
   RFCs, in AsciiDoc.