metanorma-itu 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b485ec959d83220ae57c71e774e12136e823013c8c5ba41042a56fa03d477496
-  data.tar.gz: 7467e85568f8ffa7d421bed9a1213c2b3c86e2ac210868bd37f99c449aab8980
+  metadata.gz: e4a2af7108e4cc46b5baae30adab35ca6b676562ac34fb83a4ad575a75c0af3f
+  data.tar.gz: 409987853945566a26ce6b68b90135dd3430fa4ce7b3d564d0103ad795547f01
 SHA512:
-  metadata.gz: 613b74c11bd22d589f90f020d7bd848fa6e9e9a1b89c08f9b12f7e4084013970537508119c36c33e2f2c87135e7f060a143e21487d8a5d34cf39b56f95dab226
-  data.tar.gz: 1fab3d12d67a9a5f6c7f84706d935cc60096b0dc0db24ccfb2ae07767a4a5f27ba4201584983ecbaa6c12f0e5b88cdb4a152640b9121cc63179d343a6782d229
+  metadata.gz: 6731878ecfb46064d3094c58558bb865b5dd9819a012d2c01f0cfe6e9b63d51b69702860f332b3edaf4581a65d41daecf5a1a301dd298857039b712cf25b5a47
+  data.tar.gz: b9ee173f2d18f21355540173d566fa3b4eb348147e2947c27316f5e0f38778ec0e94015c98aab0aface77e2ae218d45141e3b8198e91c437bb9dbe90c493532b

data/lib/isodoc/itu/metadata.rb

@@ -75,12 +75,12 @@ module IsoDoc
         %i(affiliations addresses emails faxes phones).each { |i| set(i, []) }
         authors.each do |a|
           append(:affiliations,
-                 a&.at(ns("./affiliation/organization/name"))&.text)
-          append(:addresses, a&.at(ns("./affiliation/organization/address/" \
-                                      "formattedAddress"))&.text)
-          append(:emails, a&.at(ns("./email"))&.text)
-          append(:faxes, a&.at(ns("./phone[@type = 'fax']"))&.text)
-          append(:phones, a&.at(ns("./phone[not(@type = 'fax')]"))&.text)
+                 a.at(ns("./affiliation/organization/name"))&.text)
+          append(:addresses, a.at(ns("./affiliation/organization/address/" \
+                                     "formattedAddress"))&.text)
+          append(:emails, a.at(ns("./email"))&.text)
+          append(:faxes, a.at(ns("./phone[@type = 'fax']"))&.text)
+          append(:phones, a.at(ns("./phone[not(@type = 'fax')]"))&.text)
         end
       end
 
@@ -117,7 +117,7 @@ module IsoDoc
         pubdate and
           set(:placedate_year,
               @labels["placedate"]
-          .sub(/%/, pubdate.text.sub(/^(\d\d\d\d).*$/, "\\1")))
+          .sub("%", pubdate.text.sub(/^(\d\d\d\d).*$/, "\\1")))
       end
 
       def monthyr(isodate)
@@ -142,7 +142,7 @@ module IsoDoc
         else super
         end
         d = get[:doctype] and
-          set(:draft_new_doctype, @labels["draft_new"].sub(/%/, d))
+          set(:draft_new_doctype, @labels["draft_new"].sub("%", d))
       end
 
       def ip_notice_received(isoxml, _out)
@@ -187,27 +187,27 @@ module IsoDoc
       end
 
       def techreport(isoxml, _out)
-        if a = isoxml&.at(ns("//bibdata/ext/meeting"))&.text
+        if a = isoxml.at(ns("//bibdata/ext/meeting"))&.text
           set(:meeting, a)
           set(:meeting_acronym, a)
         end
-        a = isoxml&.at(ns("//bibdata/ext/meeting/@acronym"))&.text and
+        a = isoxml.at(ns("//bibdata/ext/meeting/@acronym"))&.text and
           set(:meeting_acronym, a)
-        a = isoxml&.at(ns("//bibdata/ext/meeting-place"))&.text and
+        a = isoxml.at(ns("//bibdata/ext/meeting-place"))&.text and
           set(:meeting_place, a)
-        a = isoxml&.at(ns("//bibdata/ext/intended-type"))&.text and
+        a = isoxml.at(ns("//bibdata/ext/intended-type"))&.text and
           set(:intended_type, a)
-        a = isoxml&.at(ns("//bibdata/ext/source"))&.text and set(:source, a)
+        a = isoxml.at(ns("//bibdata/ext/source"))&.text and set(:source, a)
         meeting(isoxml)
       end
 
       def meeting(isoxml)
         resolution =
-          isoxml&.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
-        if o = isoxml&.at(ns("//bibdata/ext/meeting-date/on"))&.text
+          isoxml.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
+        if o = isoxml.at(ns("//bibdata/ext/meeting-date/on"))&.text
           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
+        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)}")
         end

data/lib/isodoc/itu/pdf_convert.rb

@@ -12,9 +12,8 @@ module IsoDoc
         super
       end
 
-      def pdf_stylesheet(docxml)
-        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
-        if File.exist?(File.join(@libdir, "itu.#{doctype}.xsl"))
+      def pdf_stylesheet(_docxml)
+        if File.exist?(File.join(@libdir, "itu.#{@doctype}.xsl"))
           "itu.#{doctype}.xsl"
         else
           "itu.recommendation.xsl"

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -79,8 +79,7 @@ module IsoDoc
       end
 
       def clause1(elem)
-        elem.at(ns("//bibdata/ext/doctype"))&.text ==
-          "resolution" or return super
+        @doctype == "resolution" or return super
         %w(sections bibliography).include? elem.parent.name or return super
         @suppressheadingnumbers || elem["unnumbered"] and return
         t = elem.at(ns("./title")) and t["depth"] = "1"
@@ -91,8 +90,7 @@ module IsoDoc
       end
 
       def annex1(elem)
-        elem.at(ns("//bibdata/ext/doctype"))&.text == "resolution" or
-          return super
+        @doctype == "resolution" or return super
         elem.elements.first.previous = annex1_supertitle(elem)
         t = elem.at(ns("./title")) and
           t.children = "<strong>#{to_xml(t.children)}</strong>"
@@ -141,8 +139,7 @@ module IsoDoc
       end
 
       def toc_title(docxml)
-        doctype = docxml.at(ns("//bibdata/ext/doctype"))
-        doctype&.text == "resolution" and return
+        @doctype == "resolution" and return
         super
       end
 

data/lib/isodoc/itu/word_convert.rb

@@ -42,7 +42,7 @@ module IsoDoc
       end
 
       def convert1(docxml, filename, dir)
-        if docxml&.at(ns("//bibdata/ext/doctype"))&.text == "service-publication"
+        if @doctype == "service-publication"
           @wordcoverpage = html_doc_path("word_itu_titlepage_sp.html")
           options[:bodyfont] = "Arial"
           options[:headerfont] = "Arial"

data/lib/isodoc/itu/xref_section.rb

@@ -35,11 +35,6 @@ module IsoDoc
          { path: "//preface/*", multi: true }]
       end
 
-      def initial_anchor_names(doc)
-        @doctype = doc&.at(ns("//bibdata/ext/doctype"))&.text
-        super
-      end
-
       def annextype(clause)
         if clause["obligation"] == "informative" then @labels["appendix"]
         else @labels["annex"]

data/lib/metanorma/itu/cleanup.rb

@@ -9,8 +9,7 @@ module Metanorma
       end
 
       def resolution_inline_header(xml)
-        return unless xml&.at("//bibdata/ext/doctype")&.text == "resolution"
-
+        @doctype == "resolution" or return
         xml.xpath("//clause//clause").each do |c|
           next if (title = c.at("./title")) && !title&.text&.empty?
 

data/lib/metanorma/itu/validate.rb

@@ -7,13 +7,12 @@ module Metanorma
       end
 
       def doctype_validate(xmldoc)
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(recommendation recommendation-supplement recommendation-amendment
            recommendation-corrigendum recommendation-errata recommendation-annex
            focus-group implementers-guide technical-paper technical-report
-           joint-itu-iso-iec service-publication).include? doctype or
+           joint-itu-iso-iec service-publication).include? @doctype or
           @log.add("Document Attributes", nil,
-                   "#{doctype} is not a recognised document type")
+                   "#{@doctype} is not a recognised document type")
       end
 
       def stage_validate(xmldoc)
@@ -111,9 +110,8 @@ module Metanorma
       end
 
       def unnumbered_check(xmldoc)
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         xmldoc.xpath("//clause[@unnumbered = 'true']").each do |c|
-          next if (doctype == "resolution") && (c.parent.name == "sections") &&
+          next if (@doctype == "resolution") && (c.parent.name == "sections") &&
             !c.at("./preceding-sibling::clause")
 
           @log.add("Style", c, "Unnumbered clause out of place")

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.3.1".freeze
+    VERSION = "2.3.2".freeze
   end
 end

data/metanorma-itu.gemspec

@@ -25,8 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.5.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement