metanorma-ietf 3.2.4 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15679fd3c253726b9f401c099a73c02f242a946eb358b4c7dc025f13d5aa0ed8
-  data.tar.gz: c2fef641bba26aff816757f36a6f61642190f0120874c2a01165a2513b5bb5db
+  metadata.gz: 95d5287b8cd085af79c232c2b9d5c744410758658044d1130f5e14ace554c53b
+  data.tar.gz: b710815a5b73c58b5e665482069dc7b467da91cddea0649fcd4fe6ac0e3895d5
 SHA512:
-  metadata.gz: 25c51c60d9b85a0693db8c21f3159b4875fbb0cb430a0cdbf17b33d527d1ace7106bc118d9dde7f0b607953c1c459b43688c4121e110379ef7420336822d0861
-  data.tar.gz: ca609bafe3ade87598fd0b87de4de63e6649a2c1e976f0f94768e778c98c0163561eac55a2d20d6872e8b48cb46ac5c0791ee2590827047e83c4b018521a0557
+  metadata.gz: bfa939e6c06245506aad5551ed30413e1c13639d83c65ed6342b83c9798543a019e20e209d414d6a0f21ac2adaf2ac48e5dc699391e7d205797e691e724a0d62
+  data.tar.gz: 6ee134a2450f7a1c0a8f4061b33c2ebfc23e5e0dfa72a0816e4b5f960079d340d59be038e3dab53a6c5be7a0c0c513c499b78dccdae9577c6533cd433bfc55f5

data/Gemfile

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

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/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/front.rb

@@ -9,6 +9,7 @@ module Metanorma
         personal_author(node, xml)
       end
 
+=begin
       def metadata_publisher(node, xml)
         publishers = node.attr("publisher") || "IETF"
         csv_split(publishers)&.each do |p|
@@ -30,6 +31,11 @@ module Metanorma
           end
         end
       end
+=end
+
+def default_publisher
+  "IETF"
+end
 
       def org_abbrev
         { "Internet Engineering Task Force" => "IETF" }

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.4".freeze
+    VERSION = "3.2.6".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 2.6.3"
+  spec.add_dependency "metanorma-standoc", "~> 2.7.0"
   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.2.4
+  version: 3.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-12-10 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: 2.6.3
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement