isodoc 2.1.5 → 2.2.2.2

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -24,22 +24,24 @@ module IsoDoc
         c = Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
-          .each do |t|
-          next if blank?(t["id"])
-
+          .noblank.each do |t|
           j = subfigure_increment(j, c, t)
-          label = c.print
-          label &&= label + (j.zero? ? "" : "-#{j}")
-
-          @anchors[t["id"]] = anchor_struct(
-            label, nil, @labels["figure"], "figure", t["unnumbered"]
-          )
+          sequential_figure_body(j, c, t)
         end
       end
 
+      def sequential_figure_body(subfignum, counter, block)
+        label = counter.print
+        label &&= label + (subfignum.zero? ? "" : "-#{subfignum}")
+
+        @anchors[block["id"]] = anchor_struct(
+          label, nil, @labels["figure"], "figure", block["unnumbered"]
+        )
+      end
+
       def sequential_table_names(clause)
         c = Counter.new
-        clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+        clause.xpath(ns(".//table")).noblank.each do |t|
           next if labelled_ancestor(t)
 
           @anchors[t["id"]] = anchor_struct(
@@ -51,9 +53,7 @@ module IsoDoc
 
       def sequential_formula_names(clause)
         c = Counter.new
-        clause.xpath(ns(".//formula")).reject do |n|
-          blank?(n["id"])
-        end.each do |t|
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             c.increment(t).print, t,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -62,70 +62,98 @@ module IsoDoc
         end
       end
 
-      FIRST_LVL_REQ = "[not(ancestor::permission or ancestor::requirement or "\
-                      "ancestor::recommendation)]".freeze
+      FIRST_LVL_REQ_RULE = <<~XPATH.freeze
+        [not(ancestor::permission or ancestor::requirement or ancestor::recommendation)]
+      XPATH
 
-      def sequential_permission_names(clause, klass, label)
-        c = Counter.new
-        clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}"))
-          .reject { |n| blank?(n["id"]) }.each do |t|
-          id = c.increment(t).print
-          @anchors[t["id"]] =
-            anchor_struct(id, t, label, klass, t["unnumbered"])
-          sequential_permission_names2(t, id)
+      FIRST_LVL_REQ = <<~XPATH.freeze
+        .//permission#{FIRST_LVL_REQ_RULE} | .//requirement#{FIRST_LVL_REQ_RULE} | .//recommendation#{FIRST_LVL_REQ_RULE}
+      XPATH
+
+      REQ_CHILDREN = <<~XPATH.freeze
+        ./permission | ./requirement | ./recommendation
+      XPATH
+
+      def sequential_permission_names(clause)
+        c = ReqCounter.new
+        clause.xpath(ns(FIRST_LVL_REQ)).noblank.each do |t|
+          m = @reqt_models.model(t["model"])
+          klass, label = reqt2class_label(t, m)
+          id = c.increment(label, t).print
+          sequential_permission_body(id, t, label, klass, m)
+          sequential_permission_children(t, id)
         end
       end
 
-      def sequential_permission_names2(elem, ident)
-        sequential_permission_names1(elem, ident, "permission",
-                                     @labels["permission"])
-        sequential_permission_names1(elem, ident, "requirement",
-                                     @labels["requirement"])
-        sequential_permission_names1(elem, ident, "recommendation",
-                                     @labels["recommendation"])
+      def sequential_permission_children(block, lbl)
+        c = ReqCounter.new
+        block.xpath(ns(REQ_CHILDREN)).noblank.each do |t|
+          m = @reqt_models.model(t["model"])
+          klass, label = reqt2class_nested_label(t, m)
+          id = "#{lbl}#{hierfigsep}#{c.increment(label, t).print}"
+          sequential_permission_body(id, t, label, klass, m)
+          sequential_permission_children(t, id)
+        end
       end
 
-      def sequential_permission_names1(block, lbl, klass, label)
-        c = Counter.new
-        block.xpath(ns("./#{klass}")).reject { |n| blank?(n["id"]) }.each do |t|
-          id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
-          @anchors[t["id"]] =
-            anchor_struct(id, t, label, klass, t["unnumbered"])
-          sequential_permission_names2(t, id)
+      def sequential_permission_body(id, block, label, klass, model)
+        @anchors[block["id"]] = model.postprocess_anchor_struct(
+          block, anchor_struct(id, block,
+                               label, klass, block["unnumbered"])
+        )
+
+        model.permission_parts(block, id, label, klass).each do |n|
+          @anchors[n[:id]] = anchor_struct(n[:number], n[:elem], n[:label],
+                                           n[:klass], false)
         end
       end
 
+      def reqt2class_label(block, model)
+        model.req_class_paths.each do |n|
+          v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
+          block.at("./self::#{v1}") and return [n[:klass], n[:label]]
+        end
+        [nil, nil]
+      end
+
+      def reqt2class_nested_label(block, model)
+        model.req_nested_class_paths.each do |n|
+          v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
+          block.at("./self::#{v1}") and return [n[:klass], n[:label]]
+        end
+        [nil, nil]
+      end
+
       def sequential_asset_names(clause)
         sequential_table_names(clause)
         sequential_figure_names(clause)
         sequential_formula_names(clause)
-        sequential_permission_names(clause, "permission", @labels["permission"])
-        sequential_permission_names(clause, "requirement",
-                                    @labels["requirement"])
-        sequential_permission_names(clause, "recommendation",
-                                    @labels["recommendation"])
+        sequential_permission_names(clause)
       end
 
       def hierarchical_figure_names(clause, num)
         c = Counter.new
         j = 0
         clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
-          .each do |t|
+          .noblank.each do |t|
           # next if labelled_ancestor(t) && t.ancestors("figure").empty?
 
           j = subfigure_increment(j, c, t)
-          label = "#{num}#{hiersep}#{c.print}" +
-            (j.zero? ? "" : "#{hierfigsep}#{j}")
-          next if t["id"].nil? || t["id"].empty?
-
-          @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"],
-                                            "figure", t["unnumbered"])
+          hierarchical_figure_body(num, j, c, t)
         end
       end
 
+      def hierarchical_figure_body(num, subfignum, counter, block)
+        label = "#{num}#{hiersep}#{counter.print}" +
+          (subfignum.zero? ? "" : "#{hierfigsep}#{subfignum}")
+
+        @anchors[block["id"]] = anchor_struct(label, nil, @labels["figure"],
+                                              "figure", block["unnumbered"])
+      end
+
       def hierarchical_table_names(clause, num)
         c = Counter.new
-        clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+        clause.xpath(ns(".//table")).noblank.each do |t|
           next if labelled_ancestor(t)
 
           @anchors[t["id"]] =
@@ -138,19 +166,12 @@ module IsoDoc
         hierarchical_table_names(clause, num)
         hierarchical_figure_names(clause, num)
         hierarchical_formula_names(clause, num)
-        hierarchical_permission_names(clause, num, "permission",
-                                      @labels["permission"])
-        hierarchical_permission_names(clause, num, "requirement",
-                                      @labels["requirement"])
-        hierarchical_permission_names(clause, num, "recommendation",
-                                      @labels["recommendation"])
+        hierarchical_permission_names(clause, num)
       end
 
       def hierarchical_formula_names(clause, num)
         c = Counter.new
-        clause.xpath(ns(".//formula")).reject do |n|
-          blank?(n["id"])
-        end.each do |t|
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             "#{num}#{hiersep}#{c.increment(t).print}", nil,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -159,33 +180,37 @@ module IsoDoc
         end
       end
 
-      def hierarchical_permission_names(clause, num, klass, label)
-        c = Counter.new
-        clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}"))
-          .reject { |n| blank?(n["id"]) }.each do |t|
-          id = "#{num}#{hiersep}#{c.increment(t).print}"
-          @anchors[t["id"]] =
-            anchor_struct(id, nil, label, klass, t["unnumbered"])
-          hierarchical_permission_names2(t, id)
+      def hierarchical_permission_names(clause, num)
+        c = ReqCounter.new
+        clause.xpath(ns(FIRST_LVL_REQ)).noblank.each do |t|
+          m = @reqt_models.model(t["model"])
+          klass, label = reqt2class_label(t, m)
+          id = "#{num}#{hiersep}#{c.increment(label, t).print}"
+          hierarchical_permission_body(id, t, label, klass, m)
+          hierarchical_permission_children(t, id)
         end
       end
 
-      def hierarchical_permission_names2(elem, ident)
-        hierarchical_permission_names1(elem, ident, "permission",
-                                       @labels["permission"])
-        hierarchical_permission_names1(elem, ident, "requirement",
-                                       @labels["requirement"])
-        hierarchical_permission_names1(elem, ident, "recommendation",
-                                       @labels["recommendation"])
+      def hierarchical_permission_children(block, lbl)
+        c = ReqCounter.new
+        block.xpath(ns(REQ_CHILDREN)).noblank.each do |t|
+          m = @reqt_models.model(t["model"])
+          klass, label = reqt2class_nested_label(t, m)
+          id = "#{lbl}#{hierfigsep}#{c.increment(label, t).print}"
+          hierarchical_permission_body(id, t, label, klass, m)
+          hierarchical_permission_children(t, id)
+        end
       end
 
-      def hierarchical_permission_names1(block, lbl, klass, label)
-        c = Counter.new
-        block.xpath(ns("./#{klass}")).reject { |n| blank?(n["id"]) }.each do |t|
-          id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
-          @anchors[t["id"]] =
-            anchor_struct(id, nil, label, klass, t["unnumbered"])
-          hierarchical_permission_names2(t, id)
+      def hierarchical_permission_body(id, block, label, klass, model)
+        @anchors[block["id"]] = model.postprocess_anchor_struct(
+          block, anchor_struct(id, nil,
+                               label, klass, block["unnumbered"])
+        )
+
+        model.permission_parts(block, id, label, klass).each do |n|
+          @anchors[n[:id]] = anchor_struct(n[:number], nil, n[:label],
+                                           n[:klass], false)
         end
       end
     end

data/lib/isodoc/xref.rb

@@ -24,6 +24,12 @@ module IsoDoc
       @i18n = i18n
       @labels = @i18n.get
       @klass.i18n = @i18n
+      @reqt_models = @klass.requirements_processor
+        .new({
+               default: "default", lang: lang, script: script,
+               labels: @i18n.get
+             })
+      @i18n
       @parse_settings = {}
     end
 

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -86,8 +86,6 @@ month_october: أكتوبر
 month_november: نوفمبر
 month_december: ديسمبر
 obligation: التزام
-subject: موضوع
-inherits: يرث
 admonition:
   danger: خطر
   warning: تحذير

data/lib/isodoc-yaml/i18n-de.yaml

@@ -92,8 +92,6 @@ month_october: Oktober
 month_november: November
 month_december: Dezember
 obligation: Verbindlichkeit
-subject: Thema
-inherits: Erbt
 admonition: {
   danger: Gefahr,
   warning: Warnung,

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

@@ -60,6 +60,15 @@ table: Table
 requirement: Requirement
 recommendation: Recommendation
 permission: Permission
+# OGC
+recommendationtest: Recommendation test
+requirementtest: Requirement test
+permissiontest: Permission test
+recommendationclass: Recommendations class
+requirementclass: Requirements class
+permissionclass: Permissions class
+abstracttest: Abstract test
+conformanceclass: Conformance class
 key: Key
 example: EXAMPLE
 example_xref: Example
@@ -92,8 +101,6 @@ month_october: October
 month_november: November
 month_december: December
 obligation: Obligation
-subject: Subject
-inherits: Inherits
 admonition: {
   danger: Danger,
   warning: Warning,

data/lib/isodoc-yaml/i18n-es.yaml

@@ -92,8 +92,6 @@ month_october: Octubre
 month_november: Noviembre
 month_december: Diciembre
 obligation: Obligación
-subject: Tema
-inherits: Hereda
 admonition: {
   danger: Peligro,
   warning: Advertencia,

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -90,8 +90,6 @@ month_october: Octobre
 month_november: Novembre
 month_december: Décembre
 obligation: Obligation
-subject: Sujet
-inherits: Hérite
 admonition: {
   danger: Danger,
   warning: Avertissement,

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -97,8 +97,6 @@ month_october: Октябрь
 month_november: Ноябрь
 month_december: Декабрь
 obligation: Обязательство
-subject: Тема
-inherits: Наследует
 admonition: {
   danger: Опасность,
   warning: Предупреждение,

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -87,8 +87,6 @@ month_october: 十月
 month_november: 十一月
 month_december: 十二月
 obligation: 义务
-subject: 主体
-inherits: 继承自
 admonition: {
   danger: 危险,
   warning: 警告,

data/lib/relaton/render/general.rb

@@ -1,4 +1,5 @@
 require "relaton-render"
+require "metanorma-utils"
 
 module Relaton
   module Render
@@ -15,21 +16,3 @@ module Relaton
     end
   end
 end
-
-class ::Hash
-  def deep_merge(second)
-    merger = proc { |_, v1, v2|
-      if Hash === v1 && Hash === v2
-        v1.merge(v2, &merger)
-      elsif Array === v1 && Array === v2
-        v1 | v2
-      elsif [:undefined, nil,
-             :nil].include?(v2)
-        v1
-      else
-        v2
-      end
-    }
-    merge(second.to_h, &merger)
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.2.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,30 @@ dependencies:
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: mn-requirements
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +154,16 @@ dependencies:
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +282,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -398,23 +412,15 @@ files:
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
-- lib/isodoc/base_style/all.css
 - lib/isodoc/base_style/all.scss
 - lib/isodoc/base_style/bands.scss
-- lib/isodoc/base_style/blocks.css
 - lib/isodoc/base_style/blocks.scss
-- lib/isodoc/base_style/coverpage.css
 - lib/isodoc/base_style/coverpage.scss
-- lib/isodoc/base_style/defaults.css
 - lib/isodoc/base_style/defaults.scss
-- lib/isodoc/base_style/metanorma_word.css
 - lib/isodoc/base_style/metanorma_word.scss
-- lib/isodoc/base_style/nav.css
 - lib/isodoc/base_style/nav.scss
-- lib/isodoc/base_style/reset.css
 - lib/isodoc/base_style/reset.scss
 - lib/isodoc/base_style/scripts.html
-- lib/isodoc/base_style/typography.css
 - lib/isodoc/base_style/typography.scss
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
@@ -448,6 +454,7 @@ files:
 - lib/isodoc/html_function/postprocess.rb
 - lib/isodoc/html_function/postprocess_footnotes.rb
 - lib/isodoc/i18n.rb
+- lib/isodoc/init.rb
 - lib/isodoc/metadata.rb
 - lib/isodoc/metadata_contributor.rb
 - lib/isodoc/metadata_date.rb
@@ -457,6 +464,7 @@ files:
 - lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/math.rb
+- lib/isodoc/presentation_function/refs.rb
 - lib/isodoc/presentation_function/section.rb
 - lib/isodoc/presentation_function/terms.rb
 - lib/isodoc/presentation_function/xrefs.rb
@@ -489,7 +497,7 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -504,8 +512,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []