metanorma-itu 1.3.11 → 1.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad435d6188b9f2e881c84f0d43a6c35fd2bb4d6c993d1d796b830f755a2d3e33
-  data.tar.gz: 95409047e659d65a1c4b0102ebf910d69fe062ab4731511060625ed78ddb362c
+  metadata.gz: e486ed509e01e8839797855e65a6431033298b7e307253f64b600fbc195f4caa
+  data.tar.gz: cbb5b77f6e2d99ded15a6e50375689d9f57f700d3f4f00d320e2ce110713d535
 SHA512:
-  metadata.gz: 8a3db12e7809503cd242cb1c1f3b6d1b1a579ebbed62fb7ba91c357bdc264b601aefa5e64dee6c0aa2d3cf0a2afd2a01c5e6f43c98343dbc5d0b742aa3472c96
-  data.tar.gz: bd64d897084265a9be463d56dcf31dde685b7e36ab56f75016d89d2ad7dc486816e393557c8c84a013e4fd06567c4b8ce4ffcd695d15597ada66b12295f5c006
+  metadata.gz: 550210205331fb08d6e5f9da8614f8f0f9b9883e4b353d79698a8530e4f71dce36cfd5b36d75b0fcce073569cc1f1cf33a83b9baf348179ad3f547a3c9221da6
+  data.tar.gz: 3900db56104d0d73841f932220178e3ef1e64cb085d60bcbdff5259e36fbdbca539b3dfc26d71a25934f4622a48ba7afb93813ac1bee7d86d66456064fee9692

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/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