metanorma-ietf 3.2.5 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8f95517eaa67fc95cbe0ebbf7f54833c4e1b3b2cd43926613a6564c6dbd5fa
-  data.tar.gz: 8497233d7a4e03d5f70ee53e7e3f6fdf91c2af6d4ded543537f11c8fa5167d33
+  metadata.gz: 6fd9451cbef06ef76da69248206d57d3f0ffebc2630a6555b13e427537ffbab7
+  data.tar.gz: 31fc41666d0ef64880706985072479867b4939204eddd2e7a6b1e6d7807c91b7
 SHA512:
-  metadata.gz: 4eadb338cb1289415cd8cfe9977386c57fc66e3e84ae77a88314ffffcf2da880540330f4d2d543cf5c724e0ae38f4fd5261b2a30a919ac3f6d700ce34e0fa557
-  data.tar.gz: bbeec104f704fd794a65444f2f9b3ab05dff67bf3fd721a64fb60277c25eee414555ac38bf500018d9c876444a5c7530522d027e53c95c8ee72141e3439bb8e6
+  metadata.gz: d0eea3484675fcbf5fc8f1d9e44fc0f285eb7f47aa1fab68d6df2aba8b6e387226e87228b33f26c8e8a7f43b92543f45b3d8496c73e62df78ab3831f374ea673
+  data.tar.gz: 598547b40037d36f82c146f7283cb30b18b8518e98f353b44a70f15569cdb0b505e19933ae89a8564e7c20a35b10c2b667a1651e8bae8cd5b6b56968c146c697

data/Gemfile

@@ -4,12 +4,6 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-group :development, :test do
-  gem "rspec"
-end
-
-if File.exist? "Gemfile.devel"
-  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
-end
-
 gemspec
+
+eval_gemfile("Gemfile.devel") rescue nil

data/lib/isodoc/ietf/i18n.rb

@@ -1,13 +1,14 @@
 module IsoDoc
   module Ietf
     class I18n < IsoDoc::I18n
-       def load_yaml1(lang, script)
-        y = if lang == "en"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            end
-        super.deep_merge(y)
+      def load_file(fname)
+        f = File.join(File.dirname(__FILE__), fname)
+        File.exist?(f) ? YAML.load_file(f) : {}
+      end
+
+      def load_yaml1(lang, script)
+        y = load_file("i18n-#{yaml_lang(lang, script)}.yaml")
+        y.empty? ? load_file("i18n-en.yaml").merge(super) : super.deep_merge(y)
       end
     end
   end

data/lib/isodoc/ietf/references.rb

@@ -65,7 +65,12 @@ module IsoDoc
         bib1 = bib.clone
         @isodoc.prep_for_rendering(bib1)
         bib1.namespace = nil
-        ref << @bibrenderer.render(bib1.to_xml, embedded: true)
+        ret = @bibrenderer.render(bib1.to_xml, embedded: true)
+        ref << if bib1.at(ns("./formattedref")) && !bib1.at(ns("./title"))
+                 "<front><title>#{ret}</title></front>"
+               else
+                 ret
+               end
       end
     end
   end

data/lib/metanorma/ietf/basicdoc.rng

@@ -715,27 +715,36 @@
   </define>
   <define name="ruby">
     <element name="ruby">
-      <zeroOrMore>
-        <choice>
-          <ref name="PureTextElement"/>
-          <ref name="rp"/>
-          <ref name="rt"/>
-        </choice>
-      </zeroOrMore>
+      <choice>
+        <ref name="ruby_pronunciation"/>
+        <ref name="ruby_annotation"/>
+      </choice>
+      <choice>
+        <text/>
+        <ref name="ruby"/>
+      </choice>
     </element>
   </define>
-  <define name="rp">
-    <element name="rp">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_pronunciation">
+    <element name="pronunciation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
-  <define name="rt">
-    <element name="rt">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_annotation">
+    <element name="annotation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
   <define name="br">

data/lib/metanorma/ietf/biblio.rng

@@ -374,6 +374,16 @@
       <ref name="image"/>
     </element>
   </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -760,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

data/lib/metanorma/ietf/cleanup.rb

@@ -22,7 +22,7 @@ module Metanorma
             r.replace(c.remove)
           else
             @log.add("Crossrefences", r,
-                     "No matching review for cref:[#{r.text}]")
+                     "No matching review for cref:[#{r.text}]", severity: 1)
           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.8 -->
+<!-- VERSION v1.2.9 -->
 <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">
@@ -1958,6 +1958,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>letter</value>
+            <value>symbol</value>
+            <value>formula</value>
+            <value>equation</value>
+          </choice>
+        </attribute>
+      </optional>
       <element name="name">
         <oneOrMore>
           <choice>

data/lib/metanorma/ietf/validate.rb

@@ -25,9 +25,9 @@ module Metanorma
 
       def image_validate(doc)
         doc.xpath("//image").each do |i|
-          next if i["mimetype"] == "image/svg+xml"
-
-          @log.add("MIME", i, "image #{i['src'][0, 40]} is not SVG!")
+          i["mimetype"] == "image/svg+xml" and next
+          @log.add("MIME", i, "image #{i['src'][0, 40]} is not SVG!",
+                   severity: 1)
         end
       end
 
@@ -36,10 +36,10 @@ module Metanorma
 
         doc.xpath("//bibdata/ext/editorialgroup/workgroup").each do |wg|
           wg_norm = wg.text.sub(/ (Working|Research) Group$/, "")
-          next if @workgroups.include?(wg_norm)
-
+          @workgroups.include?(wg_norm) and next
           @log.add("Document Attributes", nil,
-                   "IETF: unrecognised working group #{wg.text}")
+                   "IETF: unrecognised working group #{wg.text}",
+                   severity: 1)
         end
       end
 

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.2.5".freeze
+    VERSION = "3.2.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data