metanorma-iso 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ab1010b198fb64456b71a06834ab3c1207417c16c765f6c5905cd18ff5a0dc8
-  data.tar.gz: c92bdd8228ce983eed939cb2b38b60b7ec631d37b64ea390e26e870700f7065b
+  metadata.gz: 66e717f4c41d2cda0aa92bc42985e6f12d420e9bcdb2b0410fe085bca689a549
+  data.tar.gz: 33d5e0b9f67c9c76afcbd0feff13a81e21919c3cb48dc56524bfa34203725ae1
 SHA512:
-  metadata.gz: de58d8b4fa0e039e153cd5a9d9637adaedf45e674cb59c113e2feb4eaa1444ca7d98badd5ac080687ec66ee19305e8b8677ea855c24b1df91ddae0c12464180a
-  data.tar.gz: 48d297855239fec0dd80dbb6db404bf4b8c2a79ba49051d275f56f3dff579bda479f30ba71ba1931170088c7e3c0014878b92af7d91177151f625cdf359e7ef9
+  metadata.gz: a5249f0f6147e52c1ef81b7c32a3a431a74478a7727e8bde1842e411f20d1e56311fb41755828f93dc626e94ea14b5d661a5e4fbd6a17c41619131fe1a4d60eb
+  data.tar.gz: a97203b198a7e9baa2e28f5597f53c9cd60ab79cc0de989f5e3dcc7671d5199e9047abdf0eb0b02401d05d48317dbae45781475642275b4c15fa8a6aaf0f446d

data/lib/isodoc/iso/init.rb

@@ -21,8 +21,7 @@ module IsoDoc
       end
 
       def amd?(docxml)
-        doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
-        %w(amendment technical-corrigendum).include? doctype
+        %w(amendment technical-corrigendum).include? @doctype
       end
 
       def clausedelim

data/lib/isodoc/iso/pdf_convert.rb

@@ -14,7 +14,7 @@ module IsoDoc
       end
 
       def pdf_stylesheet(docxml)
-        case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        case @doctype
         when "amendment", "technical-corrigendum" then "iso.amendment.xsl"
         else
           "iso.international-standard.xsl"

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -158,8 +158,7 @@ module IsoDoc
       end
 
       def toc_title(docxml)
-        doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
-        %w(amendment technical-corrigendum).include?(doctype) and return
+        %w(amendment technical-corrigendum).include?(@doctype) and return
         super
       end
 

data/lib/isodoc/iso/word_convert.rb

@@ -185,8 +185,7 @@ module IsoDoc
       end
 
       def figure_name_parse(node, div, name)
-        return if name.nil?
-
+        name.nil? and return
         div.p **figure_name_attrs(node) do |p|
           name.children.each { |n| parse(n, p) }
         end
@@ -205,8 +204,7 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        return if name.nil?
-
+        name.nil? and return
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
         div.h1 class: "Annex" do |t|
           annex_name1(name, t)

data/lib/metanorma/iso/validate.rb

@@ -1,10 +1,10 @@
 require "metanorma-standoc"
-require_relative "./validate_style"
-require_relative "./validate_requirements"
-require_relative "./validate_section"
-require_relative "./validate_title"
-require_relative "./validate_image"
-require_relative "./validate_list"
+require_relative "validate_style"
+require_relative "validate_requirements"
+require_relative "validate_section"
+require_relative "validate_title"
+require_relative "validate_image"
+require_relative "validate_list"
 require "nokogiri"
 require "jing"
 require "iev"
@@ -116,13 +116,12 @@ module Metanorma
         end
       end
 
-      def doctype_validate(xmldoc)
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+      def doctype_validate(_xmldoc)
         %w(international-standard technical-specification technical-report
            publicly-available-specification international-workshop-agreement
-           guide amendment technical-corrigendum).include? doctype or
+           guide amendment technical-corrigendum).include? @doctype or
           @log.add("Document Attributes", nil,
-                   "#{doctype} is not a recognised document type")
+                   "#{@doctype} is not a recognised document type")
       end
 
       def script_validate(xmldoc)
@@ -173,8 +172,7 @@ module Metanorma
 
       def validate(doc)
         content_validate(doc)
-        doctype = doc&.at("//bibdata/ext/doctype")&.text
-        schema = case doctype
+        schema = case @doctype
                  when "amendment", "technical-corrigendum" # @amd
                    "isostandard-amd.rng"
                  else

data/lib/metanorma/iso/validate_section.rb

@@ -4,8 +4,7 @@ module Metanorma
   module ISO
     class Converter < Standoc::Converter
       def section_validate(doc)
-        doctype = doc.at("//bibdata/ext/doctype")&.text
-        unless %w(amendment technical-corrigendum).include? doctype
+        unless %w(amendment technical-corrigendum).include? @doctype
           foreword_validate(doc.root)
           normref_validate(doc.root)
           symbols_validate(doc.root)
@@ -181,7 +180,7 @@ module Metanorma
       end
 
       def tech_report_style(root)
-        root.at("//bibdata/ext/doctype")&.text == "technical-report" or return
+        @doctype == "technical-report" or return
         root.xpath("//sections/clause[not(@type = 'scope')] | //annex")
           .each do |s|
           r = requirement_check(extract_text(s)) and

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.5.1".freeze
+    VERSION = "2.5.2".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -32,9 +32,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.5.1"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.0"
   spec.add_dependency "mnconvert", "~> 1.14"
-  spec.add_dependency "pubid-iso", "~> 0.5.0"
+  spec.add_dependency "pubid-iso", "~> 0.6.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 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: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement