metanorma-itu 1.2.15 → 1.3.3

data/lib/isodoc/itu/metadata.rb

@@ -74,7 +74,7 @@ module IsoDoc
       def person_attributes(authors)
         %i(affiliations addresses emails faxes phones).each { |i| set(i, []) }
         authors.each do |a|
-          append(:affiliations, 
+          append(:affiliations,
                  a&.at(ns("./affiliation/organization/name"))&.text)
           append(:addresses, a&.at(ns("./affiliation/organization/address/"\
                                       "formattedAddress"))&.text)
@@ -131,7 +131,7 @@ module IsoDoc
       def doctype(isoxml, _out)
         d = isoxml&.at(ns("//bibdata/ext/doctype"))&.text
         set(:doctype_original, d)
-        set(:doctype_abbreviated, @labels["doctype_abbrev"][d])
+        set(:doctype_abbreviated, @labels.dig("doctype_abbrev", d))
         if d == "recommendation-annex"
           set(:doctype, "Recommendation")
           set(:doctype_display, "Recommendation")
@@ -197,7 +197,7 @@ module IsoDoc
           set(:meeting_date, resolution ? ddMMMMYYYY(o, nil) : ddMMMYYYY(o))
         elsif f = isoxml&.at(ns("//bibdata/ext/meeting-date/from"))&.text
           t = isoxml&.at(ns("//bibdata/ext/meeting-date/to"))&.text
-          set(:meeting_date, resolution ? ddMMMMYYYY(f, t) :  "#{ddMMMYYYY(f)}/#{ddMMMYYYY(t)}")
+          set(:meeting_date, resolution ? ddMMMMYYYY(f, t) : "#{ddMMMYYYY(f)}/#{ddMMMYYYY(t)}")
         end
       end
     end

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -48,7 +48,7 @@ module IsoDoc
         return unless contents.empty?
         link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
         link && !/^\[.*\]$/.match(link) and link = "[#{link}]"
-        link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
+        link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link, node)
         non_locality_elems(node).each { |n| n.remove }
         node.add_child(link)
       end

data/lib/isodoc/itu/xref.rb

@@ -51,11 +51,10 @@ module IsoDoc
             i.increment(c)
             annex_names(c, i.print.upcase)
           end
-          i = Counter.new("@")
+          i = Counter.new("@", skip_i: true)
           docxml.xpath(ns("//annex[not(@obligation = 'informative')]"))
             .each do |c|
             i.increment(c)
-            i.increment(c) if i.print == "I"
             annex_names(c, i.print)
           end
         end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.2.15"
+    VERSION = "1.3.3".freeze
   end
 end

data/metanorma-itu.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "metanorma/itu/version"
 
@@ -25,20 +25,20 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
+  spec.add_dependency "isodoc", "~> 1.6.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.9.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.8.0"
-  spec.add_dependency "isodoc", "~> 1.5.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "tzinfo-data" # we need this for windows only
 
   spec.add_development_dependency "byebug", "~> 9.1"
-  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 5.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.2.15
+  version: 1.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.3.4
 - !ruby/object:Gem::Dependency
-  name: ruby-jing
+  name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
-  name: isodoc
+  name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
-- !ruby/object:Gem::Dependency
-  name: sassc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -194,18 +180,32 @@ dependencies:
         version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +292,6 @@ files:
 - lib/asciidoctor/itu/front.rb
 - lib/asciidoctor/itu/isodoc.rng
 - lib/asciidoctor/itu/itu.rng
-- lib/asciidoctor/itu/macros.rb
 - lib/asciidoctor/itu/reqt.rng
 - lib/asciidoctor/itu/validate.rb
 - lib/isodoc/itu.rb
@@ -319,7 +318,13 @@ files:
 - lib/isodoc/itu/html/wordstyle.css
 - lib/isodoc/itu/html/wordstyle.scss
 - lib/isodoc/itu/html_convert.rb
+- lib/isodoc/itu/i18n-ar.yaml
+- lib/isodoc/itu/i18n-de.yaml
 - lib/isodoc/itu/i18n-en.yaml
+- lib/isodoc/itu/i18n-es.yaml
+- lib/isodoc/itu/i18n-fr.yaml
+- lib/isodoc/itu/i18n-ru.yaml
+- lib/isodoc/itu/i18n-zh-Hans.yaml
 - lib/isodoc/itu/i18n.rb
 - lib/isodoc/itu/init.rb
 - lib/isodoc/itu/itu.implementers-guide.xsl

data/lib/asciidoctor/itu/macros.rb

@@ -1,27 +0,0 @@
-module Asciidoctor
-  module ITU
-    class AddMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-      named :add
-      parse_content_as :text
-      using_format :short
-
-      def process(parent, _target, attrs)
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        %{<add>#{out}</add>}
-      end
-    end
-
-    class DelMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-      named :del
-      parse_content_as :text
-      using_format :short
-
-      def process(parent, _target, attrs)
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        %{<del>#{out}</del>}
-      end
-    end
-  end
-end