metanorma-ietf 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04fd898116e48263444f530446a4099229d32151da9937ed2524ce51004cb79a
-  data.tar.gz: 17e58309364f9f812b8daa409d781a0b078615bda69ab0c92b9bb2f868f09d16
+  metadata.gz: 0caa70c59e0b00b7eaf785a68d24b0ec9368c4c0c45c1dee96ef973b0d8c0150
+  data.tar.gz: fcc948fcdb7b9e4b05596b741659052789c595deaf65798a517929bc30173faf
 SHA512:
-  metadata.gz: 0f2e66094b3dc68c6bdf07bea94be7a1e84297af218d40ac1e0566179595c3261d0768eea9f11c4faa0337927111f28c80487111d47d3d9595df265d046f6759
-  data.tar.gz: 90a2b51f517cc109b918b7fdab717c0376d11294be3bdc518d79f934edb2e92b06bddb31ccb1c9d89c91f173f4ef70352110a955c9cff4981152d1ae7936bd93
+  metadata.gz: 4699fae2fcb874453ca24a16295b72efe450f03dbb16f002884002b7b324f0f5bf03c843f0424a1a8395914d3db9d031f37b2ffb221d0fa2317e0a63c487b0cc
+  data.tar.gz: ba585e9aa3859230b9bf0ff1f574a33ded9268620e40c4438495c8b5a1731b0f8a89e2628b9e1d8a942b9a6d25bcecaba8e0557fc0ea943bebd5eed2c6265280

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/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.1".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.5.4"
 
   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.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-28 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.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement