metanorma-itu 1.3.10 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9fedf3f6b88ed3fec5d058a59d289f893646fbcdea430d5f628c2c5f4801b4e
-  data.tar.gz: e569b3339b3437a5ac5db0b72a94fa6b6c8647e64d64e7c6690a3af5c9cc57b2
+  metadata.gz: 289ed3fed7e3c8d9a52e0de224e73db390c93a2378ae0a25c66d2ff12af255fd
+  data.tar.gz: fba11b78fa3488fc1f1ac9642d602e8eafc7bff0d4b9af09bbf929f868f89eb8
 SHA512:
-  metadata.gz: b7870e02cd137d2f25bc39b552dee726ec92144e45b60a3aaf733285eb2394a5cb040f0a38eeef43a0f7fca7f5fca54326c780e4c9c2a0a502667ee497d7ae54
-  data.tar.gz: 02d819038572881fb4882a20cc4a5ee18c96853226e8ca6820600391af390230128cbf32842660ede1e756976efbbfbcc73990bbb4caa51551f9943f20f2aa04
+  metadata.gz: bf6c0f9873c415a381273594e030864096e5a7a58fd4a9771021fd8dff447abfeea3fa307f51025cf8a2fbb5e4d91da3ac562000ec466c26c82db973a6508da9
+  data.tar.gz: fd0be35b3e8a1e280a7098e5966bc3ff3f976708b15ea9bc5a46bf911e36b47d2ccd243eab31a23abfea88f83d0f8b6aebccaaad7052b3d7277d23c70b40093b

data/Gemfile

@@ -6,6 +6,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-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

data/Rakefile

@@ -1,8 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'isodoc/gem_tasks'
+require "isodoc/gem_tasks"
 
 IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/rspec

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-  
+
 # This file was generated by Bundler.
 #
 # The application 'rspec' is installed as part of a gem, and
@@ -15,4 +15,3 @@ require "rubygems"
 require "bundler/setup"
 
 load Gem.bin_path("rspec-core", "rspec")
-

data/lib/asciidoctor/itu/basicdoc.rng

@@ -624,6 +624,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +637,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +647,12 @@
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -822,7 +833,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +848,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +864,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/lib/asciidoctor/itu/converter.rb

@@ -1,6 +1,7 @@
 require "asciidoctor"
 require "asciidoctor/standoc/converter"
 require "fileutils"
+require "metanorma-utils"
 require_relative "./front"
 require_relative "./validate"
 require_relative "./cleanup"
@@ -107,16 +108,11 @@ module Asciidoctor
         return unless node.attr("keywords")
 
         node.attr("keywords").split(/, */).sort.each_with_index do |kw, i|
-          xml.keyword (i.zero? ? strict_capitalize(kw) : kw)
+          kw_out = i.zero? ? Metanorma::Utils.strict_capitalize_first(kw) : kw
+          xml.keyword kw_out
         end
       end
 
-      def strict_capitalize(str)
-        letters = str.split("")
-        letters.first.upcase!
-        letters.join
-      end
-
       def clause_parse(attrs, xml, node)
         node.option?("unnumbered") and attrs[:unnumbered] = true
         case sectiontype1(node)

data/lib/asciidoctor/itu/front.rb

@@ -1,6 +1,7 @@
 require "asciidoctor"
 require "asciidoctor/standoc/converter"
 require "fileutils"
+require_relative "./front_id"
 
 module Asciidoctor
   module ITU
@@ -13,6 +14,10 @@ module Asciidoctor
         end
       end
 
+      def relaton_relations
+        super + %w(complements)
+      end
+
       def title_attr(type, lang = "en")
         { language: lang, format: "text/plain", type: type }
       end
@@ -109,55 +114,6 @@ module Asciidoctor
         end
       end
 
-      def metadata_id(node, xml)
-        provisional_id(node, xml)
-        itu_id(node, xml)
-        recommendation_id(node, xml)
-      end
-
-      def provisional_id(node, xml)
-        return unless node.attr("provisional-name")
-
-        xml.docidentifier **{ type: "ITU-provisional" } do |i|
-          i << node.attr("provisional-name")
-        end
-      end
-
-      ITULANG = { "en" => "E", "fr" => "F", "ar" => "A", "es" => "S",
-                  "zh" => "C", "ru" => "R" }.freeze
-
-      def itu_id1(node, lang)
-        bureau = node.attr("bureau") || "T"
-        id = if doctype(node) == "service-publication"
-               @i18n.annex_to_itu_ob_abbrev.sub(/%/, node.attr("docnumber"))
-             else
-               "ITU-#{bureau} #{node.attr('docnumber')}"
-             end
-        id + (lang ? "-#{ITULANG[@lang]}" : "")
-      end
-
-      def itu_id(node, xml)
-        return unless node.attr("docnumber")
-
-        xml.docidentifier **{ type: "ITU" } do |i|
-          i << itu_id1(node, false)
-        end
-        xml.docidentifier **{ type: "ITU-lang" } do |i|
-          i << itu_id1(node, true)
-        end
-        xml.docnumber { |i| i << node.attr("docnumber") }
-      end
-
-      def recommendation_id(node, xml)
-        return unless node.attr("recommendationnumber")
-
-        node.attr("recommendationnumber").split("/").each do |s|
-          xml.docidentifier **{ type: "ITU-Recommendation" } do |i|
-            i << s
-          end
-        end
-      end
-
       def metadata_series(node, xml)
         node.attr("series") and
           xml.series **{ type: "main" } do |s|
@@ -191,18 +147,6 @@ module Asciidoctor
         xml.ip_notice_received (node.attr("ip-notice-received") || "false")
       end
 
-      def structured_id(node, xml)
-        return unless node.attr("docnumber")
-
-        xml.structuredidentifier do |i|
-          i.bureau node.attr("bureau") || "T"
-          i.docnumber node.attr("docnumber")
-          a = node.attr("annexid") and i.annexid a
-          a = node.attr("amendment-number") and i.amendment a
-          a = node.attr("corrigendum-number") and i.corrigendum a
-        end
-      end
-
       def metadata_techreport(node, xml)
         a = node.attr("meeting") and
           metadata_meeting(a, node.attr("meeting-acronym"), xml)

data/lib/asciidoctor/itu/front_id.rb

@@ -0,0 +1,67 @@
+module Asciidoctor
+  module ITU
+    class Converter < Standoc::Converter
+      def metadata_id(node, xml)
+        provisional_id(node, xml)
+        itu_id(node, xml)
+        recommendation_id(node, xml)
+      end
+
+      def provisional_id(node, xml)
+        return unless node.attr("provisional-name")
+
+        xml.docidentifier **{ type: "ITU-provisional" } do |i|
+          i << node.attr("provisional-name")
+        end
+      end
+
+      ITULANG = { "en" => "E", "fr" => "F", "ar" => "A", "es" => "S",
+                  "zh" => "C", "ru" => "R" }.freeze
+
+      def itu_id1(node, lang)
+        bureau = node.attr("bureau") || "T"
+        id = if doctype(node) == "service-publication"
+               @i18n.annex_to_itu_ob_abbrev.sub(/%/,
+                                                node.attr("docnumber"))
+             else
+               "ITU-#{bureau} #{node.attr('docnumber')}"
+             end
+        id + (lang ? "-#{ITULANG[@lang]}" : "")
+      end
+
+      def itu_id(node, xml)
+        return unless node.attr("docnumber")
+
+        xml.docidentifier **{ type: "ITU" } do |i|
+          i << itu_id1(node, false)
+        end
+        xml.docidentifier **{ type: "ITU-lang" } do |i|
+          i << itu_id1(node, true)
+        end
+        xml.docnumber { |i| i << node.attr("docnumber") }
+      end
+
+      def recommendation_id(node, xml)
+        return unless node.attr("recommendationnumber")
+
+        node.attr("recommendationnumber").split("/").each do |s|
+          xml.docidentifier **{ type: "ITU-Recommendation" } do |i|
+            i << s
+          end
+        end
+      end
+
+      def structured_id(node, xml)
+        return unless node.attr("docnumber")
+
+        xml.structuredidentifier do |i|
+          i.bureau node.attr("bureau") || "T"
+          i.docnumber node.attr("docnumber")
+          a = node.attr("annexid") and i.annexid a
+          a = node.attr("amendment-number") and i.amendment a
+          a = node.attr("corrigendum-number") and i.corrigendum a
+        end
+      end
+    end
+  end
+end