metanorma-itu 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5929f61643c8dbafa66db621a66293f54bd32f6d49230c9f5bc7b2631a9d9fe0
-  data.tar.gz: e1f97d4f79ab995555c6b5aac7db3118aa96908f8722a4b1982875fa5f5f98d5
+  metadata.gz: 53aa5ba06fe4c815ebf48d2ed8ec630f6b36aa29931a1ce3e2b7bb4072df51c0
+  data.tar.gz: d7187d43af041c57475376b83386586c309485f0be9c98d2afc0fe77491040a2
 SHA512:
-  metadata.gz: 9680e50d0d3d1b447a9a647cc94a01cd1f1553f6b5f2a0edc1657781f4947c80a037818bf9046242109b282e0146d4dacd9c14f6bcde93edfdd1d96cfa7518ca
-  data.tar.gz: 6a353703d1015385bcb8741e17df7a42d622ca65a0a340cd7242a442a900f2a904a8f27d6f0c37aeed2b8d50116d96d00f275d0d97b7c24cbb2b5480e076fc19
+  metadata.gz: 7ff02edcb14b675aadace9f1aaf4be5408926d898663acf18a712d796d37c52f0510d4fadd6c2d44e922ecea0359188b7a552ec601b4b94b4104ccf9847c1908
+  data.tar.gz: 186aa7ff33a27c75b9f60c485bd2998c1c6b570c8cbcfe7434b1a02a6c386822f4c313416d5ae253278dd2ea2698f10ac00b5841921333ea5f9a35fcd819cc34

data/.travis.yml

@@ -1,3 +1,5 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
 language: ruby
 cache: bundler
 os:
@@ -6,12 +8,14 @@ os:
 rvm:
 - 2.5
 - 2.4
-- 2.3
 - ruby-head
-before_install:
-- gem install bundler -v 2.0.1
-- bundle install
+before_install: 
+- nvm install 8
 - npm install -g puppeteer
+- npm install
+- gem install bundler -v 2.0.1
+- bundle update
 matrix:
   allow_failures:
     - rvm: ruby-head
+

data/appveyor.yml

@@ -1,5 +1,10 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
 version: '{build}'
 
+cache:
+  - vendor/bundle
+
 environment:
   matrix:
     - RUBY_VERSION: 25
@@ -16,6 +21,8 @@ install:
 
 build_script:
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - set GIT_TERMINAL_PROMPT=0
+  - bundle config --local path vendor/bundle
   - bundle update
   - bundle install
 
@@ -26,4 +33,3 @@ before_test:
 
 test_script:
   - bundle exec rake
-

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "asciidoctor/csand"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rspec

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+  
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
+  "../../Gemfile", Pathname.new(__FILE__).realpath
+)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")
+

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/asciidoctor/itu/converter.rb

@@ -48,6 +48,7 @@ module Asciidoctor
       end
 
       def make_preface(x, s)
+        s.add_previous_sibling("<preface/>") unless x.at("//preface")
         make_abstract(x, s)
         move_sections_into_preface(x, x.at("//preface"))
       end

data/lib/asciidoctor/itu/front.rb

@@ -52,6 +52,7 @@ module Asciidoctor
         suffix = 2
         while node.attr("bureau_#{suffix}")
           metadata_committee1(node, xml, "_#{suffix}")
+          suffix += 1
         end
       end
 
@@ -59,45 +60,35 @@ module Asciidoctor
         xml.editorialgroup do |a|
           a.bureau ( node.attr("bureau#{suffix}") || "T" )
           a.group **attr_code(type: node.attr("grouptype#{suffix}")) do |g|
-            g.name node.attr("group#{suffix}")
-            g.acronym node.attr("groupacronym#{suffix}") if node.attr("groupacronym#{suffix}")
-            if node.attr("groupyearstart#{suffix}")
-              g.period do |p|
-                period.start node.attr("groupyearstart#{suffix}")
-                period.end node.attr("groupyearend#{suffix}") if node.attr("groupacronym#{suffix}")
-              end
-            end
+            metadata_committee2(node, g, suffix, "")
           end
           if node.attr("subgroup#{suffix}")
             a.subgroup **attr_code(type: node.attr("subgrouptype#{suffix}")) do |g|
-              g.name node.attr("subgroup#{suffix}")
-              g.acronym node.attr("subgroupacronym#{suffix}") if node.attr("subgroupacronym#{suffix}")
-              if node.attr("subgroupyearstart#{suffix}")
-                g.period do |p|
-                  period.start node.attr("subgroupyearstart#{suffix}")
-                  period.end node.attr("subgroupyearend#{suffix}") if node.attr("subgroupyearend#{suffix}")
-                end
-              end
+              metadata_committee2(node, g, suffix, "sub")
             end
           end
           if node.attr("workgroup#{suffix}")
             a.workgroup **attr_code(type: node.attr("workgrouptype#{suffix}")) do |g|
-              g.name node.attr("workgroup#{suffix}")
-              g.acronym node.attr("workgroupacronym#{suffix}") if node.attr("workgroupacronym#{suffix}")
-              if node.attr("workgroupyearstart#{suffix}")
-                g.period do |p|
-                  period.start node.attr("workgroupyearstart#{suffix}")
-                  period.end node.attr("workgroupyearend#{suffix}") if node.attr("wokrgroupyearend#{suffix}")
-                end
-              end
+              metadata_committee2(node, g, suffix, "work")
             end
           end
         end
       end
 
+      def metadata_committee2(node, g, suffix, prefix)
+        g.name node.attr("#{prefix}group#{suffix}")
+        g.acronym node.attr("#{prefix}groupacronym#{suffix}") if node.attr("#{prefix}groupacronym#{suffix}")
+        if node.attr("#{prefix}groupyearstart#{suffix}")
+          g.period do |p|
+            p.start node.attr("#{prefix}groupyearstart#{suffix}")
+            p.end node.attr("#{prefix}groupyearend#{suffix}") if node.attr("#{prefix}groupacronym#{suffix}")
+          end
+        end
+      end
+
       def metadata_id(node, xml)
-        itu_id(node, xml)
         provisional_id(node, xml)
+        itu_id(node, xml)
       end
 
       def provisional_id(node, xml)
@@ -170,9 +161,9 @@ module Asciidoctor
       end
 
       def metadata_ext(node, xml)
-        metadata_doctype(node, ext)
-        metadata_committee(node, ext)
-        metadata_ics(node, ext)
+        metadata_doctype(node, xml)
+        metadata_committee(node, xml)
+        metadata_ics(node, xml)
         metadata_keywords(node, xml)
         metadata_recommendationstatus(node, xml)
         metadata_ip_notice(node, xml)

data/lib/asciidoctor/itu/isostandard.rng

@@ -71,18 +71,6 @@
         </choice>
       </element>
     </define>
-    <define name="biblionote">
-      <element name="note">
-        <optional>
-          <!-- Biblio date notes can be footnoted -->
-          <attribute name="type"/>
-        </optional>
-        <optional>
-          <attribute name="reference"/>
-        </optional>
-        <ref name="FormattedString"/>
-      </element>
-    </define>
     <define name="sections">
       <element name="sections">
         <ref name="clause"/>

data/lib/asciidoctor/itu/validate.rb

@@ -29,8 +29,8 @@ module Asciidoctor
       end
 
       def approval_validate(xmldoc)
-        s = xmldoc.at("//bibdata/recommendationstatus") || return
-        process = s.at("./@process").text
+        s = xmldoc.at("//bibdata/ext/recommendationstatus/approvalstage") || return
+        process = s["process"]
         if process == "aap" and %w(determined in-force).include? s.text
           warn "Recommendation Status #{s.text} inconsistent with AAP"
         end
@@ -41,15 +41,11 @@ module Asciidoctor
 
       def itu_identifier_validate(xmldoc)
         s = xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
-          /^ITU-[RTF] [AD-VX-Z]\.[0-9]+$/.match x.text or
-            warn "#{x.text} does not match ITU document identifier conventions"
+          /^ITU-[RTF] [AD-VX-Z]\.[0-9]+$/.match(x.text) or
+            warn("#{x.text} does not match ITU document identifier conventions")
         end
       end
 
     end
   end
 end
-
-DocumentType =
-  "recommendation" | "recommendation-supplement" | "recommendation-amendment" | "recommendation-corrigendum" | "recommendation-errata" |
-  "recommendation-annex" | "focus-group" | "implementers-guide" | "technical-paper" | "technical-report" | "joint-itu-iso-iec"

data/lib/isodoc/itu/base_convert.rb

@@ -36,7 +36,7 @@ module IsoDoc
 
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]} "
+          t << "#{anchor(annex['id'], :label)} "
           t.br
           t.b do |b|
             name&.children&.each { |c2| parse(c2, b) }
@@ -44,14 +44,6 @@ module IsoDoc
         end
       end
 
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        end
-      end
-
       def i18n_init(lang, script)
         super
       end
@@ -102,7 +94,7 @@ module IsoDoc
         f = isoxml.at(ns(q)) or return num
         out.div do |div|
           num = num + 1
-          clause_name(num, "References", div, nil)
+          clause_name(num, @normref_lbl, div, nil)
           norm_ref_preface(f, div)
           biblio_list(f, div, false)
         end
@@ -141,17 +133,33 @@ module IsoDoc
         end
       end
 
-      ELSEWHERE_TERMS = "This Recommendation uses the following terms defined elsewhere:"
-      HERE_TERMS = "This Recommendation defines the following terms:"
+      def terms_defs_title(node)
+        t = node.at(ns("./title")) and return t.text
+        super
+      end
+
+      def terms_defs(node, out, num)
+        f = node.at(ns(IsoDoc::Convert::TERM_CLAUSE)) or return num
+        out.div **attr_code(id: f["id"]) do |div|
+          num = num + 1
+          clause_name(num, terms_defs_title(f), div, nil)
+          if f.at(ns("./clause | ./terms | ./term")).nil? then out.p "None."
+          else
+            f.children.reject { |c1| c1.name == "title" }.each do |c1|
+              parse(c1, div)
+            end
+          end
+        end
+        num
+      end
 
       def terms_parse(node, out)
         out.div **attr_code(id: node["id"]) do |div|
           clause_parse_title(node, div, node.at(ns("./title")), out)
           title = node.at(ns("./title"))&.text&.downcase
-          title == "terms defined elsewhere" and out.p ELSEWHERE_TERMS
-          title == "terms defined in this recommendation" and out.p HERE_TERMS
-          content = node.at(ns("./clause | ./term"))
-          if content.nil? then out.p "None."
+          title == "terms defined elsewhere" and out.p @labels["elsewhere_terms"]
+          title == "terms defined in this recommendation" and out.p @labels["here_terms"]
+          if node.at(ns("./clause | ./term")).nil? then out.p "None."
           else
             node.children.reject { |c1| c1.name == "title" }.each do |c1|
               parse(c1, div)
@@ -163,12 +171,12 @@ module IsoDoc
       def termdef_parse1(node, div, term, defn, source)
         div.p **{ class: "TermNum", id: node["id"] } do |p|
           p.b do |b|
-            b << get_anchors[node["id"]][:label]
+            b << anchor(node["id"], :label)
             insert_tab(b, 1)
             term.children.each { |n| parse(n, b) }
           end
           source and p << " [#{source.value}]"
-          p << ":"
+          p << ": "
           defn and defn.children.each { |n| parse(n, p) }
         end
       end
@@ -205,6 +213,13 @@ module IsoDoc
           out.a(**{ "href": "#" + node["bibitemid"] }) { |l| l << linkend }
         end
       end
+
+      def middle_title(out)
+        out.p(**{ class: "zzSTDTitle1" }) do |p|
+          id = @meta.get[:docidentifier] and p << "Recommendation #{id}" 
+        end
+        out.p(**{ class: "zzSTDTitle2" }) { |p| p << @meta.get[:doctitle] }
+      end
     end
   end
 end

data/lib/isodoc/itu/html/htmlstyle.scss

@@ -944,7 +944,7 @@ span.doc-title {
 .prefatory-section {
   padding: 0 3em 0 6em; }
 
-.zzSTDTitle1, .MsoCommentText {
+.zzSTDTitle1, .zzSTDTitle2, .MsoCommentText {
   display: none; }
 
 .coverpage {

data/lib/isodoc/itu/html_convert.rb

@@ -20,7 +20,7 @@ module IsoDoc
         super
       end
 
-            def html_toc(docxml)
+      def html_toc(docxml)
         docxml
       end
 

data/lib/isodoc/itu/i18n-en.yaml

@@ -1,2 +1,8 @@
 termsdef: Definitions
 termnote: NOTE %
+normref: References
+elsewhere_terms: >-
+  This Recommendation uses the following terms defined elsewhere:
+here_terms: >-
+  This Recommendation defines the following terms:
+

data/lib/isodoc/itu/metadata.rb

@@ -37,16 +37,6 @@ module IsoDoc
         set(:docidentifier, dn&.text)
       end
 
-      def status_abbr(status)
-        case status
-        when "working-draft" then "wd"
-        when "committee-draft" then "cd"
-        when "draft-standard" then "d"
-        else
-          ""
-        end
-      end
-
       def unpublished(status)
         %w(in-force-prepublished).include? status.downcase
       end

data/lib/isodoc/itu/word_convert.rb

@@ -64,11 +64,6 @@ module IsoDoc
         docxml
       end
 
-      def middle_title(out)
-        out.p(**{ class: "zzSTDTitle1" }) { |p| p << "Recommendation " + @meta.get[:docidentifier] }
-        out.p(**{ class: "zzSTDTitle2" }) { |p| p << @meta.get[:doctitle] }
-      end
-
       def word_preface(docxml)
         super
         abstractbox = docxml.at("//div[@id='abstractbox']")

data/lib/metanorma/itu.rb

@@ -3,8 +3,8 @@ require "metanorma/itu/processor"
 module Metanorma
   module ITU
 
-    ORGANIZATION_NAME_SHORT = "Acme"
-    ORGANIZATION_NAME_LONG = "Acme Corp."
+    ORGANIZATION_NAME_SHORT = "ITU"
+    ORGANIZATION_NAME_LONG = "International Telecommunication Union"
     DOCUMENT_NAMESPACE = "https://open.ribose.com/standards/itu"
 
   end

data/lib/metanorma/itu/processor.rb

@@ -19,7 +19,7 @@ module Metanorma
       end
 
       def version
-        "Metanorma::Acme #{Metanorma::ITU::VERSION}"
+        "Metanorma::ITU #{Metanorma::ITU::VERSION}"
       end
 
       def input_to_isodoc(file, filename)

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/metanorma-itu.gemspec

@@ -22,12 +22,13 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
-  spec.add_dependency "isodoc", "~> 0.9.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 0.10.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"
@@ -40,5 +41,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.0"
-  spec.add_development_dependency "metanorma-cli", "~> 1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: metanorma-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.2
 description: 'Metanorma for the ITU.
 
   '
@@ -266,6 +252,9 @@ files:
 - README.adoc
 - Rakefile
 - appveyor.yml
+- bin/console
+- bin/rspec
+- bin/setup
 - lib/asciidoctor/itu.rb
 - lib/asciidoctor/itu/biblio.rng
 - lib/asciidoctor/itu/converter.rb
@@ -312,7 +301,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -320,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Metanorma for the ITU