metanorma-ietf 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47adf288717bcbd4914d1a3d43fb8eeea4d18fbb6f9675846c9ec37a9664f142
-  data.tar.gz: f0486d16c7a457465cce21790e3c76cb3422b0508d5ae57a150e15bf4e1059a7
+  metadata.gz: e247eb259866b4caae32725e9d508603a2ef5ede6d72fa9558366249f93fa45f
+  data.tar.gz: bfde54f8d5b35adbe3e9f4bfa6d915f49aeac78df5fc0d6bd189d242798d0871
 SHA512:
-  metadata.gz: e22190786fb20f67dd85cc5e0bd3e831e32b5ee54c0de91d08780106a624e902c11108672469afdcf80451489fddc11472f0ee73910592c947550b3f243b4c0b
-  data.tar.gz: 85c7688efec6428a459a6d6f7d182c092ad68a5ed6a6e971e379fab3d6c6c46f5e77e083aa11be20d7570691505d3b61da50e217c93643451d215387e747d486
+  metadata.gz: 2e863071188dfb05b1636eeb9a7307a453e65dfb61497a13e6a33b946e7c1d02c634210c8f2d5083c6f29702607989402cf874e83c92e59bd115142d3ee218f2
+  data.tar.gz: 15a0e135e9985c2a2995b85c8bea4b9bd84f9149874e4fc35a7c476684162a65018a54d73e073639bbea0cbae0b8846e54388b9695d8839bc0ad426699fa0d9f

data/lib/isodoc/ietf/blocks.rb

@@ -72,7 +72,9 @@ module IsoDoc::Ietf
     end
 
     def note_label(node)
-      l10n("#{super}: ")
+      n = @xrefs.get[node["id"]]
+      return l10n("#{@note_lbl}: ") if n.nil? || n[:label].nil? || n[:label].empty?
+      l10n("#{@note_lbl} #{n[:label]}: ")
     end
 
     def note_parse(node, out)

data/lib/isodoc/ietf/front.rb

@@ -23,11 +23,16 @@ module IsoDoc::Ietf
       super
     end
 
+    def output_if_translit(text)
+      return nil if text.nil?
+      text.transliterate != text ? text.transliterate : nil
+    end
+
     def title(isoxml, front)
       title = @meta.get[:doctitle] or return
       front.title title, **attr_code(abbrev: @meta.get[:docabbrev],
-                                     ascii: @meta.get[:docascii] ||
-                                     title.transliterate)
+                                     ascii: (@meta.get[:docascii] ||
+                                     output_if_translit(title)))
     end
 
     def seriesinfo(isoxml, front)
@@ -37,7 +42,7 @@ module IsoDoc::Ietf
 
     def seriesinfo_attr(isoxml)
       attr_code(value: @meta.get[:docnumber] || "",
-                asciiValue: @meta.get[:docnumber]&.transliterate,
+                asciiValue: output_if_translit(@meta.get[:docnumber]),
                 status: @meta.get[:stage],
                 stream: isoxml&.at(ns("//bibdata/series[@type = 'stream']/"\
                                       "title"))&.text)
@@ -82,9 +87,9 @@ module IsoDoc::Ietf
 
     def pers_author_attrs1(ret, full, init, c)
       full and ret.merge!(attr_code(
-        asciiFullname: full&.transliterate,
-        asciiInitials: init&.transliterate,
-        asciiSurname: c&.at(ns("./surname"))&.text&.transliterate))
+        asciiFullname: output_if_translit(full),
+        asciiInitials: output_if_translit(init),
+        asciiSurname: output_if_translit(c&.at(ns("./surname")))))
       ret
     end
 
@@ -113,8 +118,8 @@ module IsoDoc::Ietf
     def organization(org, out, show)
       name = org.at(ns("./name"))&.text
       out.organization name, **attr_code(
-        showOnFrontPage: show&.text, ascii: name&.transliterate,
-        asciiAbbrev: org&.at(ns("./abbreviation"))&.transliterate,
+        showOnFrontPage: show&.text, ascii: output_if_translit(name),
+        asciiAbbrev: output_if_translit(org.at(ns("./abbreviation"))),
         abbrev: org.at(ns("./abbreviation")))
     end
 

data/lib/isodoc/ietf/reqt.rb

@@ -1,5 +1,10 @@
 module IsoDoc::Ietf
   class RfcConvert < ::IsoDoc::Convert
+    def recommendation_labels(node)
+      [node.at(ns("./label")), node.at(ns("./title")), 
+       @xrefs.anchor(node['id'], :label, false)]
+    end
+
     def recommendation_name(node, out, type)
       label, title, lbl = recommendation_labels(node)
       out.t **{ keepWithNext: "true" }  do |b|

data/lib/isodoc/ietf/section.rb

@@ -81,11 +81,11 @@ module IsoDoc::Ietf
 
     def series2category(series)
       case series&.downcase
-      when "standard" then "std"
-      when "informational" then "info"
-      when "experimental" then "exp"
+      when "standard", "std" then "std"
+      when "informational", "info" then "info"
+      when "experimental", "exp" then "exp"
       when "bcp" then "bcp"
-      when "fyi" then "info"
+      when "fyi", "info" then "info"
       when "full-standard" then "std"
       when "historic" then "historic"
       else

data/lib/metanorma/ietf/processor.rb

@@ -48,6 +48,10 @@ module Metanorma
         nil
       end
 
+      def use_presentation_xml(ext)
+        false
+      end
+
       def xml2rfc_present?
         !which("xml2rfc").nil?
       end

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-   VERSION = "2.1.0".freeze
+   VERSION = "2.1.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc