metanorma-mpfa 0.5.14 → 0.6.2

data/lib/isodoc/mpfa/word_convert.rb

@@ -31,7 +31,6 @@ module IsoDoc
           htmlstylesheet: html_doc_path("htmlstyle.scss"),
           htmlcoverpage: html_doc_path("html_rsd_titlepage.html"),
           htmlintropage: html_doc_path("html_rsd_intro.html"),
-          scripts: html_doc_path("scripts.html"),
           wordstylesheet: html_doc_path("wordstyle.scss"),
           standardstylesheet: html_doc_path("rsd.scss"),
           header: html_doc_path("header.html"),

data/lib/isodoc/mpfa/xref.rb

@@ -3,18 +3,18 @@ module IsoDoc
     class Xref < IsoDoc::Xref
       FRONT_CLAUSE = "//*[parent::preface]".freeze
 
-      def initial_anchor_names(d)
-        d.xpath(ns(self.class::FRONT_CLAUSE)).each do |c|
+      def initial_anchor_names(doc)
+        doc.xpath(ns(self.class::FRONT_CLAUSE)).each do |c|
           preface_names(c)
           sequential_asset_names(c)
         end
-        middle_section_asset_names(d)
-        clause_names(d, 0)
-        termnote_anchor_names(d)
-        termexample_anchor_names(d)
+        middle_section_asset_names(doc)
+        clause_names(doc, 0)
+        termnote_anchor_names(doc)
+        termexample_anchor_names(doc)
       end
 
-      def annex_name_lbl(clause, num)
+      def annex_name_lbl(_clause, num)
         l10n("<strong>#{@labels['annex']} #{num}</strong>")
       end
 
@@ -31,20 +31,20 @@ module IsoDoc
       def container_names(clause, lvl)
         if clause["container"]
           @anchors[clause["id"]] =
-            { label: nil, xref: clause.at(ns("./title"))&.text, level: lvl+1 }
+            { label: nil, xref: clause.at(ns("./title"))&.text, level: lvl + 1 }
         end
         clause.xpath(ns("./clause | ./term  | ./terms | "\
                         "./definitions")).each do |c|
-          container_names(c, clause["container"] ? lvl+1 : lvl)
+          container_names(c, clause["container"] ? lvl + 1 : lvl)
         end
       end
 
-      def sect_names(clause, num, i, lvl, prev_lvl)
+      def sect_names(clause, num, i, lvl, _prev_lvl)
         return i if clause.nil?
+
         curr = i
         if !clause["container"]
-          retlvl = lvl
-          i+=1
+          i += 1
           curr = i
           name = num.nil? ? i.to_s : "#{num}.#{i}"
           @anchors[clause["id"]] = { label: name, level: lvl + 1,
@@ -57,28 +57,29 @@ module IsoDoc
           if clause["container"]
             i, lvl = sect_names(c, num, i, lvl, lvl)
           else
-            j, prev = sect_names(c, name, j, lvl+1, prev)
+            j, prev = sect_names(c, name, j, lvl + 1, prev)
           end
         end
-        i = j if j >0
+        i = j if j.positive?
         i = curr if lvl < prev
         [i, prev]
       end
 
-      def annex_naming(c, num, lvl, i)
-        if c["guidance"] then annex_names1(c, "#{num}E", lvl + 1)
+      def annex_naming(clause, num, lvl, idx)
+        if clause["guidance"] then annex_names1(clause, "#{num}E", lvl + 1)
         else
-          i+= 1 unless c["container"]
-          annex_names1(c, "#{num}.#{i}", lvl + 1)
+          idx += 1 unless clause["container"]
+          annex_names1(clause, "#{num}.#{idx}", lvl + 1)
         end
-        i
+        idx
       end
 
       def annex_names(clause, num)
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), value: num,
-                                   xref: l10n("#{@labels['annex']} #{num}"), level: 1 }
+        @anchors[clause["id"]] =
+          { label: annex_name_lbl(clause, num), value: num,
+            xref: l10n("#{@labels['annex']} #{num}"), level: 1 }
         if a = single_annex_special_section(clause)
-          annex_names1(a, "#{num}", 1)
+          annex_names1(a, num.to_s, 1)
         else
           i = 0
           clause.xpath(ns("./clause | ./references")).each do |c|
@@ -90,8 +91,11 @@ module IsoDoc
       end
 
       def annex_names1(clause, num, level)
-        clause["container"] or @anchors[clause["id"]] =
-          { label: num, xref: l10n("#{@labels['annex']} #{num}"), level: level }
+        unless clause["container"]
+          @anchors[clause["id"]] =
+            { label: num,
+              xref: l10n("#{@labels['annex']} #{num}"), level: level }
+        end
         i = 0
         clause.xpath(ns("./clause | ./references")).each do |c|
           i = annex_naming(c, num, level, i)

data/lib/metanorma/mpfa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module MPFA
-    VERSION = "0.5.14"
+    VERSION = "0.6.2".freeze
   end
 end

data/metanorma-mpfd.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/mpfa/version"
 
@@ -29,18 +29,18 @@ 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 "metanorma-standoc", "~> 1.8.0"
-  spec.add_dependency "isodoc", "~> 1.5.0"
+  spec.add_dependency "isodoc", "~> 1.6.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.9.0"
   spec.add_dependency "twitter_cldr"
 
   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", "~> 12.0"
+  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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfa
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.3.4
 - !ruby/object:Gem::Dependency
-  name: metanorma-standoc
+  name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: isodoc
+  name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,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
@@ -142,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -166,18 +152,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