metanorma-ietf 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04fd898116e48263444f530446a4099229d32151da9937ed2524ce51004cb79a
-  data.tar.gz: 17e58309364f9f812b8daa409d781a0b078615bda69ab0c92b9bb2f868f09d16
+  metadata.gz: 3c1762cf1c04cf88835f2e0a18c9779cff01a8a6d342241e7e72a756072ab9c8
+  data.tar.gz: 54954987db100a47a4d443fed697637d0fa90748fdbed6a4bcfe35ae677c22ac
 SHA512:
-  metadata.gz: 0f2e66094b3dc68c6bdf07bea94be7a1e84297af218d40ac1e0566179595c3261d0768eea9f11c4faa0337927111f28c80487111d47d3d9595df265d046f6759
-  data.tar.gz: 90a2b51f517cc109b918b7fdab717c0376d11294be3bdc518d79f934edb2e92b06bddb31ccb1c9d89c91f173f4ef70352110a955c9cff4981152d1ae7936bd93
+  metadata.gz: f989c4cbf195de5c2f2f8b4afda5611cdad02f910f9b38aa1f31c58e33ba97aa5128e09aed2cf92720578deaeebfab26479450a181955b7d0084e7700d772ab9
+  data.tar.gz: 4004434ec7add5c7c0084ee10f9bd6fad254edcf176fc4ba72436e8461af870b4b94ae10f66926ece58be4b4e95982e353c3cdae8a086620196ae206194bbbfb

data/lib/isodoc/ietf/inline.rb

@@ -1,5 +1,3 @@
-require "mathml2asciimath"
-
 module IsoDoc
   module Ietf
     class RfcConvert < ::IsoDoc::Convert
@@ -60,7 +58,8 @@ module IsoDoc
 
       def stem_parse(node, out)
         stem = case node["type"]
-               when "MathML" then MathML2AsciiMath.m2a(node.children.to_xml)
+               when "MathML" then Plurimath::Math
+                 .parse(node.children.to_xml, "mathml").to_asciimath
                else HTMLEntities.new.encode(node.text)
                end
         out << "#{@openmathdelim} #{stem} #{@closemathdelim}"
@@ -82,12 +81,15 @@ module IsoDoc
         end
       end
 
+      def image_parse_attrs(node)
+        { src: node["src"], title: node["title"],
+          align: node["align"], name: node["filename"],
+          anchor: node["id"], type: "svg",
+          alt: node["alt"] }
+      end
+
       def image_parse(node, out, caption)
-        attrs = { src: node["src"], title: node["title"],
-                  align: node["align"], name: node["filename"],
-                  anchor: node["id"], type: "svg",
-                  alt: node["alt"] }
-        out.artwork **attr_code(attrs)
+        out.artwork **attr_code(image_parse_attrs(node))
         image_title_parse(out, caption)
       end
 
@@ -102,14 +104,10 @@ module IsoDoc
       def svg_parse(node, out)
         if node.parent.name == "image" then super
         else
-          attrs = { src: node["src"], title: node["title"],
-                  align: node["align"], name: node["filename"],
-                  anchor: node["id"], type: "svg",
-                  alt: node["alt"] }
-        out.artwork **attr_code(attrs) do |x|
-          out = x
-          super
-        end
+          out.artwork **attr_code(image_parse_attrs(node)) do |x|
+            out = x
+            super
+          end
         end
       end
 

data/lib/isodoc/ietf/metadata.rb

@@ -15,7 +15,7 @@ module IsoDoc
       end
 
       def relaton_relations
-        %w(included-in described-by derived-from instance)
+        %w(included-in described-by derived-from instance-of)
         # = item describedby convertedfrom alternate
       end
 

data/lib/isodoc/ietf/section.rb

@@ -105,7 +105,7 @@ module IsoDoc
         links = isoxml
           .xpath(ns("//bibdata/relation[@type = 'includedIn' or " \
                     "@type = 'describedBy' or @type = 'derivedFrom' or " \
-                    "@type = 'instance']")) || return
+                    "@type = 'instanceOf']")) || return
         links.each do |l|
           out.link href: l&.at(ns("./bibitem/docidentifier"))&.text,
                    rel: rel2iana(l["type"])
@@ -117,7 +117,7 @@ module IsoDoc
         when "includedIn" then "item"
         when "describedBy" then "describedby"
         when "derivedFrom" then "convertedfrom"
-        when "instance" then "alternate"
+        when "instanceOf" then "alternate"
         else
           "alternate"
         end

data/lib/metanorma/ietf/front.rb

@@ -2,7 +2,7 @@ module Metanorma
   module Ietf
     class Converter < ::Metanorma::Standoc::Converter
       def relaton_relations
-        %w(included-in described-by derived-from instance obsoletes updates)
+        %w(included-in described-by derived-from instance-of obsoletes updates)
       end
 
       def metadata_author(node, xml)

data/lib/metanorma/ietf/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.3 -->
+<!-- VERSION v1.2.4 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -2068,6 +2068,9 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <choice>
         <ref name="verbaldefinition"/>
         <ref name="nonverbalrep"/>

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.2.0".freeze
+    VERSION = "3.2.2".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -36,9 +36,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mathml2asciimath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement