isodoc 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa02186be0f73d998dca870f3559df00184697cc3582ef302eb934e4901d1ab1
-  data.tar.gz: 54cf027ca0fcab8ec1c97b35d7ada8ec7137a32a2adeecfa2c0cb9b653b3b0f2
+  metadata.gz: 0cc231c707c79c5af17d4a07818b64395a13328377f6ab4521e2cdfe1ad8c884
+  data.tar.gz: 1b6a810aae9f30c35eeea2f59daddc10d62d63cfd3efd3a0c0813c1c6a7b8bf0
 SHA512:
-  metadata.gz: 251471002a6b16dd050364344f6a63e99b0e3b266a0dcc65cb4f83382b5ebfece49cc75ea65229282ef61a7206fb1ac4d7aba441b86b19704c6d9d00398ce3f2
-  data.tar.gz: 5fde838af0af79d78ccc4fecd730bc64cc60e6afaf68691f5e046d18ada04df54a922b61d98b22632a9395e21caa4c0cbbafceea70c729da839f9b732beb54c9
+  metadata.gz: 4403a6d48af622fc31f0829683d4c11d2c76226a15f877deb449eaf8fcdf37e9b7fe55b25225ac1889fc2d3a15eda554d568efb9a988def3fe7bdc3e4d1632fc
+  data.tar.gz: 3365c6b7317a602ea24bf62d3ccc73cadd8ac3b872735945388172f029c0b02460e8f2337f95a192b786057ea69045acc4917a7454c4145bb670777da770ce9e

data/lib/isodoc/function/section_titles.rb

@@ -52,8 +52,8 @@ module IsoDoc
       end
 
       def clause_title_depth(node, title)
-        depth = node.ancestors(sections_names.join(", ")).size + 1
         depth = title["depth"] if title && title["depth"]
+        depth = node.ancestors(sections_names.join(", ")).size + 1 unless depth
         depth
       end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -70,14 +70,15 @@ module IsoDoc
 
     # do not change to Presentation XML rendering
     def sem_xml_descendant?(node)
-      !node.ancestors("preferred, admitted, deprecated, related, " \
-        "definition, termsource").empty? and return true
-      !node.ancestors("xref, eref, origin, link").empty? and return true
-      !node.ancestors("name, title").empty? and return true
-      node.ancestors("bibitem") &&
-        !node.ancestors("formattedref, biblio-tag") and return true
-      !node.ancestors("requirement, recommendation, permission").empty? &&
-        node.ancestors("fmt-provision").empty? and return true
+      ancestor_names = node.ancestors.map(&:name)
+
+      return true if %w[preferred admitted deprecated related definition termsource].any? { |name| ancestor_names.include?(name) }
+      return true if %w[xref eref origin link name title].any? { |name| ancestor_names.include?(name) }
+      return true if ancestor_names.include?("bibitem") &&
+        !%w[formattedref biblio-tag].any? { |name| ancestor_names.include?(name) }
+      return true if (ancestor_names & %w[requirement recommendation permission]).any? &&
+        !ancestor_names.include?("fmt-provision")
+
       false
     end
 

data/lib/isodoc/presentation_function/section.rb

@@ -15,11 +15,25 @@ module IsoDoc
     end
 
     def unnumbered_clause?(elem)
-      !elem.ancestors("boilerplate, metanorma-extension").empty? ||
+      numbered_clause_invalid_context?(elem) ||
         @suppressheadingnumbers || elem["unnumbered"] ||
         elem.at("./ancestor::*[@unnumbered = 'true']")
     end
 
+    # context in which clause numbering is invalid:
+    # metanorma-extension, boilerplate
+    def numbered_clause_invalid_context?(elem)
+      @ncic_cache ||= {}
+      elem or return false
+      @ncic_cache.key?(elem) and return @ncic_cache[elem]
+      if ["metanorma-extension", "boilerplate"].include?(elem.name)
+        @ncic_cache[elem] = true
+      else
+        elem.respond_to?(:parent) or return false
+        @ncic_cache[elem] = numbered_clause_invalid_context?(elem.parent)
+      end
+    end
+
     def clausedelim
       ret = super
       ret && !ret.empty? or return ret
@@ -29,8 +43,9 @@ module IsoDoc
     def clause1(elem)
       level = @xrefs.anchor(elem["id"], :level, false) ||
         (elem.ancestors("clause, annex").size + 1)
-      lbl = @xrefs.anchor(elem["id"], :label, !unnumbered_clause?(elem))
-      if unnumbered_clause?(elem) || !lbl
+      is_unnumbered = unnumbered_clause?(elem)
+      lbl = @xrefs.anchor(elem["id"], :label, !is_unnumbered)
+      if is_unnumbered || !lbl
         prefix_name(elem, {}, nil, "title")
       else
         prefix_name(elem, { caption: "<tab/>" }, "#{lbl}#{clausedelim}",
@@ -132,10 +147,10 @@ module IsoDoc
       clauses.empty? and return
       preface = clauses.first.parent
       clauses.each do |clause|
-      float = preceding_floats(clause)
-      xpath = after.map { |n| "./self::xmlns:#{n}" }.join(" | ")
-      xpath.empty? and xpath = "./self::*[not(following-sibling::*)]"
-      preface_move1(clause, preface, float, nil, xpath)
+        float = preceding_floats(clause)
+        xpath = after.map { |n| "./self::xmlns:#{n}" }.join(" | ")
+        xpath.empty? and xpath = "./self::*[not(following-sibling::*)]"
+        preface_move1(clause, preface, float, nil, xpath)
       end
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.1.2".freeze
+  VERSION = "3.1.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Ribose Inc.