RubyGems - isodoc - Versions diffs - 1.8.2.1 → 1.8.3.2 - Mend

isodoc 1.8.2.1 → 1.8.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

checksums.yaml +4 -4
data/Gemfile +2 -0
data/lib/isodoc/function/cleanup.rb +1 -11
data/lib/isodoc/function/inline.rb +2 -2
data/lib/isodoc/function/terms.rb +0 -3
data/lib/isodoc/function/utils.rb +10 -5
data/lib/isodoc/i18n.rb +31 -10
data/lib/isodoc/presentation_function/block.rb +2 -3
data/lib/isodoc/presentation_function/image.rb +2 -2
data/lib/isodoc/presentation_function/terms.rb +25 -1
data/lib/isodoc/presentation_xml_convert.rb +2 -1
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/xref/xref_gen.rb +10 -7
data/lib/isodoc/xref/xref_gen_seq.rb +159 -148
data/lib/isodoc/xref/xref_sect_gen.rb +5 -10
data/lib/isodoc/xref.rb +2 -0
data/lib/isodoc/xslfo_convert.rb +26 -1
data/spec/isodoc/cleanup_spec.rb +0 -129
data/spec/isodoc/i18n_spec.rb +38 -0
data/spec/isodoc/inline_spec.rb +1 -1
data/spec/isodoc/postproc_spec.rb +0 -73
data/spec/isodoc/terms_spec.rb +149 -191
data/spec/isodoc/xref_spec.rb +71 -0
data/spec/isodoc/xslfo_convert_spec.rb +35 -0
data/spec/spec_helper.rb +1 -1
metadata +6 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dee14fd22318290ef7a79cd3dff9b69c65bb5f9ea22160255d81c6f34fb6ac82
-  data.tar.gz: 879a52fc92753e7311f102963a3eb2db76115e6ec5add68edf9a4733dbab954e
+  metadata.gz: a491aebbf7d96bbb11f6bd7129c7219c5b8a369a2dbb68526d4e96ab404844ea
+  data.tar.gz: 774fad3f626285e163ce640d73e1eec0467db607ea8ce96ea2c7df29c12d7d3b
 SHA512:
-  metadata.gz: 7e345be88c816bbebe4ec66aaf9e7dcc9273c4f539152c77b6500dd14a12db3cd61befc9d2702feef2c6e4d43c158ca23cab8621452ed815b1cfd6aa3197e023
-  data.tar.gz: 3fb800c7c1b9ec54faec69ef936b95bfdf64f9d5de2b02177edf5422bd05d0f379aed55dabe4cd2ee12ac2eb29052d761ec3b4d00984d03052e9e02083d556b1
+  metadata.gz: b0b41b09f83e226704f423400471cc34747252cb8adc8d796d9ca3f1eee5e1302fd4f07d94a93b60059766962b3263c773197f51975fea59f255e84c08cffde6
+  data.tar.gz: ae011856532563358213949b61f4797779fbeb531f65ae3ad5a41f1b4b1904b01a7c43734980113ff54db90246413a422294d20f231f5f7b2778f36d9abf08af

data/Gemfile CHANGED Viewed

@@ -9,3 +9,5 @@ gemspec
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
+gem "reline", "~> 0.2.8.pre.11"

data/lib/isodoc/function/cleanup.rb CHANGED Viewed

@@ -2,17 +2,7 @@ module IsoDoc
   module Function
     module Cleanup
       def textcleanup(docxml)
-        termref_cleanup(passthrough_cleanup(docxml))
-      end
-      def termref_cleanup(docxml)
-        docxml
-          .gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/,
-                l10n(", #{@i18n.modified} [/TERMREF]"))
-          .gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ")
-          .gsub(/\[TERMREF\]\s*/, l10n("[#{@i18n.source}: "))
-          .gsub(%r{\s*\[/TERMREF\]\s*}, l10n("]"))
-          .gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
+        passthrough_cleanup(docxml)
       end
       def passthrough_cleanup(docxml)

data/lib/isodoc/function/inline.rb CHANGED Viewed

@@ -41,8 +41,8 @@ module IsoDoc
       end
       def eref_target(node)
-        return "##{node['bibitemid']}" unless url = @bibitems[node["bibitemid"]]
-          &.at(ns("./uri[@type = 'citation']"))
+        return "##{node['bibitemid']}" unless (!@bibitems.nil? &&
+          url = @bibitems[node["bibitemid"]]&.at(ns("./uri[@type = 'citation']")))
         href = suffix_url(url.text)
         anchor = node&.at(ns(".//locality[@type = 'anchor']"))&.text&.strip

data/lib/isodoc/function/terms.rb CHANGED Viewed

@@ -6,7 +6,6 @@ module IsoDoc
       end
       def modification_parse(node, out)
-        out << "[MODIFICATION]"
         para = node.at(ns("./p"))
         para.children.each { |n| parse(n, out) }
       end
@@ -58,9 +57,7 @@ module IsoDoc
       def termref_parse(node, out)
         out.p do |p|
-          p << "[TERMREF]"
           node.children.each { |n| parse(n, p) }
-          p << "[/TERMREF]"
         end
       end

data/lib/isodoc/function/utils.rb CHANGED Viewed

@@ -37,10 +37,9 @@ module IsoDoc
       end
       def attr_code(attributes)
-        attributes = attributes.compact.map
-        attributes.map do |k, v|
-          [k, v.is_a?(String) ? HTMLEntities.new.decode(v) : v]
-        end.to_h
+        attributes.compact.transform_values do |v|
+          v.is_a?(String) ? HTMLEntities.new.decode(v) : v
+        end
       end
       DOCTYPE_HDR = "<!DOCTYPE html SYSTEM "\
@@ -188,10 +187,17 @@ module IsoDoc
       end
       def image_localfile(img)
+        case img["src"]
+        when /^data:/
+          save_dataimage(img["src"], false)
+        when %r{^([A-Z]:)?/}
+          img["src"]
+=begin
         if /^data:/.match? img["src"]
           save_dataimage(img["src"], false)
         elsif %r{^([A-Z]:)?/}.match? img["src"]
           img["src"]
+=end
         else
           File.join(@localdir, img["src"])
         end
@@ -211,7 +217,6 @@ module IsoDoc
         c = HTMLEntities.new
         text.split(/([<>])/).each_slice(4).map do |a|
           a[0] = c.encode(c.decode(a[0]), :hexadecimal)
-          a[2] = c.encode(c.decode(a[2]), :hexadecimal) if a.size >= 3
           a
         end.join
       end

data/lib/isodoc/i18n.rb CHANGED Viewed

@@ -55,8 +55,8 @@ module IsoDoc
       @labels = y
       @labels["language"] = @lang
       @labels["script"] = @script
-      @labels.each do |k, v|
-        self.class.send(:define_method, k.downcase) { v }
+      @labels.each do |k, _v|
+        self.class.send(:define_method, k.downcase) { get[k] }
       end
     end
@@ -68,19 +68,40 @@ module IsoDoc
     # function localising spaces and punctuation.
     # Not clear if period needs to be localised for zh
     def l10n(text, lang = @lang, script = @script)
-      if lang == "zh" && script == "Hans"
-        xml = Nokogiri::HTML::DocumentFragment.parse(text)
-        xml.traverse do |n|
-          next unless n.text?
+      if lang == "zh" && script == "Hans" then l10n_zh(text)
+      else bidiwrap(text, lang, script)
+      end
+    end
-          n.replace(n.text.gsub(/ /, "").gsub(/:/, "：").gsub(/,/, "、")
-            .gsub(/\(/, "（").gsub(/\)/, "）").gsub(/\[/, "【").gsub(/\]/, "】"))
-        end
-        xml.to_xml.gsub(/<b>/, "").gsub("</b>", "").gsub(/<\?[^>]+>/, "")
+    def bidiwrap(text, lang, script)
+      my_script, my_rtl, outer_rtl = bidiwrap_vars(lang, script)
+      if my_rtl && !outer_rtl
+        mark = %w(Arab Aran).include?(my_script) ? "&#x61c;" : "&#x200f;"
+        "#{mark}#{text}#{mark}"
+      elsif !my_rtl && outer_rtl then "&#x200e;#{text}&#x200e;"
       else text
       end
     end
+    def bidiwrap_vars(lang, script)
+      my_script = script || Metanorma::Utils.default_script(lang)
+      [my_script,
+       Metanorma::Utils.rtl_script?(my_script),
+       Metanorma::Utils.rtl_script?(@script || Metanorma::Utils
+         .default_script(@lang))]
+    end
+    def l10n_zh(text)
+      xml = Nokogiri::HTML::DocumentFragment.parse(text)
+      xml.traverse do |n|
+        next unless n.text?
+        n.replace(n.text.gsub(/ /, "").gsub(/:/, "：").gsub(/,/, "、")
+          .gsub(/\(/, "（").gsub(/\)/, "）").gsub(/\[/, "【").gsub(/\]/, "】"))
+      end
+      xml.to_xml.gsub(/<b>/, "").gsub("</b>", "").gsub(/<\?[^>]+>/, "")
+    end
     def multiple_and(names, andword)
       return "" if names.empty?
       return names[0] if names.length == 1

data/lib/isodoc/presentation_function/block.rb CHANGED Viewed

@@ -12,11 +12,11 @@ module IsoDoc
       return if number.nil? || number.empty?
       unless name = node.at(ns("./#{elem}"))
-        node.children.empty? and node.add_child("<#{elem}></#{elem}>") or
+        (node.children.empty? and node.add_child("<#{elem}></#{elem}>")) or
           node.children.first.previous = "<#{elem}></#{elem}>"
         name = node.children.first
       end
-      if name.children.empty? then name.add_child(number)
+      if name.children.empty? then name.add_child(cleanup_entities(number))
       else (name.children.first.previous = "#{number}#{delim}")
       end
     end
@@ -29,7 +29,6 @@ module IsoDoc
     def sourcecode1(elem)
       return if labelled_ancestor(elem)
-      return unless elem.ancestors("example").empty?
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
       prefix_name(elem, "&nbsp;&mdash; ",

data/lib/isodoc/presentation_function/image.rb CHANGED Viewed

@@ -29,8 +29,8 @@ module IsoDoc
     def figure1(elem)
       return sourcecode1(elem) if elem["class"] == "pseudocode" ||
         elem["type"] == "pseudocode"
-      return if labelled_ancestor(elem) && elem.ancestors("figure").empty? ||
-        elem.at(ns("./figure")) && !elem.at(ns("./name"))
+      return if (labelled_ancestor(elem) && elem.ancestors("figure").empty?) ||
+        (elem.at(ns("./figure")) && !elem.at(ns("./name")))
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
       prefix_name(elem, "&nbsp;&mdash; ",

data/lib/isodoc/presentation_function/terms.rb CHANGED Viewed

@@ -121,8 +121,8 @@ module IsoDoc
     end
     def designation_annotate(desgn, name)
-      designation_field(desgn, name)
       designation_boldface(desgn)
+      designation_field(desgn, name)
       g = desgn.at(ns("./expression/grammar")) and
         name << ", #{designation_grammar(g).join(', ')}"
       designation_localization(desgn, name)
@@ -219,5 +219,29 @@ module IsoDoc
         end
       end
     end
+    def termsource(docxml)
+      docxml.xpath(ns("//termsource/modification")).each do |f|
+        termsource_modification(f)
+      end
+      docxml.xpath(ns("//termsource")).each do |f|
+        termsource1(f)
+      end
+    end
+    def termsource1(elem)
+      while elem&.next_element&.name == "termsource"
+        elem << "; #{elem.next_element.remove.children.to_xml}"
+      end
+      elem.children = l10n("[#{@i18n.source}: #{elem.children.to_xml.strip}]")
+    end
+    def termsource_modification(mod)
+      mod.previous_element.next = ", #{@i18n.modified}"
+      mod.text.strip.empty? or mod.previous = " &#x2013; "
+      mod.elements.size == 1 and
+        mod.elements[0].replace(mod.elements[0].children)
+      mod.replace(mod.children)
+    end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb CHANGED Viewed

@@ -18,7 +18,7 @@ module IsoDoc
       info docxml, nil
       conversions(docxml)
       docxml.root["type"] = "presentation"
-      docxml.to_xml
+      docxml.to_xml.gsub(/&lt;/, "&#x3c;").gsub(/&gt;/, "&#x3e;")
     end
     def conversions(docxml)
@@ -68,6 +68,7 @@ module IsoDoc
       termnote docxml
       termdefinition docxml
       designation docxml
+      termsource docxml
       concept docxml
       related docxml
     end

data/lib/isodoc/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.8.2.1".freeze
+  VERSION = "1.8.3.2".freeze
 end

data/lib/isodoc/xref/xref_gen.rb CHANGED Viewed

@@ -63,11 +63,8 @@ module IsoDoc
             c.increment(n)
             idx = increment_label(examples, n, c, false)
             @anchors[n["id"]] =
-              # { type: "termexample", label: idx, value: c.print,
-              # xref: l10n("#{anchor(t['id'], :xref)}, "\
-              # "#{@labels['example_xref']} #{c.print}") }
-              anchor_struct(idx, n,
-                            @labels["example_xref"], "termexample", n["unnumbered"])
+              anchor_struct(idx, n, @labels["example_xref"], "termexample",
+                            n["unnumbered"])
           end
         end
       end
@@ -170,8 +167,7 @@ module IsoDoc
       def deflist_term_anchor_names(list, list_anchor)
         list.xpath(ns("./dt")).each do |li|
-          label = li.text
-          label = l10n("#{list_anchor[:xref]}: #{label}")
+          label = l10n("#{list_anchor[:xref]}: #{dt2xreflabel(li)}")
           li["id"] and @anchors[li["id"]] =
                          { xref: label, type: "deflistitem",
                            container: list_anchor[:container] }
@@ -181,6 +177,13 @@ module IsoDoc
         end
       end
+      def dt2xreflabel(dterm)
+        label = dterm.dup
+        label.xpath(ns(".//p")).each { |x| x.replace(x.children) }
+        label.xpath(ns(".//index")).each(&:remove)
+        label.children.to_xml
+      end
       def bookmark_anchor_names(xml)
         xml.xpath(ns(".//bookmark")).reject { |n| blank?(n["id"]) }.each do |n|
           parent = nil

data/lib/isodoc/xref/xref_gen_seq.rb CHANGED Viewed

@@ -1,181 +1,192 @@
-module IsoDoc::XrefGen
-  module Blocks
-    def hiersep
-      "."
-    end
-    def hierfigsep
-      "-"
-    end
+require_relative "../function/utils"
-    def subfigure_increment(idx, counter, elem)
-      if elem.parent.name == "figure" then idx += 1
-      else
-        idx = 0
-        counter.increment(elem)
+module IsoDoc
+  module XrefGen
+    module Blocks
+      def hiersep
+        "."
       end
-      idx
-    end
-    def sequential_figure_names(clause)
-      c = Counter.new
-      j = 0
-      clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
-        .each do |t|
-        j = subfigure_increment(j, c, t)
-        label = c.print + (j.zero? ? "" : "-#{j}")
-        next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(
-          label, nil, @labels["figure"], "figure", t["unnumbered"]
-        )
+      def hierfigsep
+        "-"
       end
-    end
-    def sequential_table_names(clause)
-      c = Counter.new
-      clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
-        @anchors[t["id"]] = anchor_struct(
-          c.increment(t).print, nil,
-          @labels["table"], "table", t["unnumbered"]
-        )
+      def subfigure_increment(idx, counter, elem)
+        if elem.parent.name == "figure" then idx += 1
+        else
+          idx = 0
+          counter.increment(elem)
+        end
+        idx
       end
-    end
-    def sequential_formula_names(clause)
-      c = Counter.new
-      clause.xpath(ns(".//formula")).reject { |n| blank?(n["id"]) }.each do |t|
-        @anchors[t["id"]] = anchor_struct(
-          c.increment(t).print, t,
-          t["inequality"] ? @labels["inequality"] : @labels["formula"],
-          "formula", t["unnumbered"]
-        )
+      def sequential_figure_names(clause)
+        c = Counter.new
+        j = 0
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
+          .each do |t|
+          next if labelled_ancestor(t) && t.ancestors("figure").empty?
+          j = subfigure_increment(j, c, t)
+          label = c.print + (j.zero? ? "" : "-#{j}")
+          next if t["id"].nil? || t["id"].empty?
+          @anchors[t["id"]] = anchor_struct(
+            label, nil, @labels["figure"], "figure", t["unnumbered"]
+          )
+        end
       end
-    end
-    FIRST_LVL_REQ = "[not(ancestor::permission or ancestor::requirement or "\
-      "ancestor::recommendation)]".freeze
+      def sequential_table_names(clause)
+        c = Counter.new
+        clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+          next if labelled_ancestor(t)
-    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)
+          @anchors[t["id"]] = anchor_struct(
+            c.increment(t).print, nil,
+            @labels["table"], "table", t["unnumbered"]
+          )
+        end
       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"])
-    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_formula_names(clause)
+        c = Counter.new
+        clause.xpath(ns(".//formula")).reject do |n|
+          blank?(n["id"])
+        end.each do |t|
+          @anchors[t["id"]] = anchor_struct(
+            c.increment(t).print, t,
+            t["inequality"] ? @labels["inequality"] : @labels["formula"],
+            "formula", t["unnumbered"]
+          )
+        end
       end
-    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"])
-    end
-    def hierarchical_figure_names(clause, num)
-      c = Counter.new
-      j = 0
-      clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
-        .each do |t|
-        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"])
+      FIRST_LVL_REQ = "[not(ancestor::permission or ancestor::requirement or "\
+                      "ancestor::recommendation)]".freeze
+      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)
+        end
       end
-    end
-    def hierarchical_table_names(clause, num)
-      c = Counter.new
-      clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+      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"])
+      end
-        @anchors[t["id"]] =
-          anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
-                        nil, @labels["table"], "table", t["unnumbered"])
+      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)
+        end
       end
-    end
-    def hierarchical_asset_names(clause, num)
-      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",
+      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"])
-      hierarchical_permission_names(clause, num, "recommendation",
+        sequential_permission_names(clause, "recommendation",
                                     @labels["recommendation"])
-    end
+      end
+      def hierarchical_figure_names(clause, num)
+        c = Counter.new
+        j = 0
+        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
+          .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"])
+        end
+      end
-    def hierarchical_formula_names(clause, num)
-      c = Counter.new
-      clause.xpath(ns(".//formula")).reject { |n| blank?(n["id"]) }.each do |t|
+      def hierarchical_table_names(clause, num)
+        c = Counter.new
+        clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+          next if labelled_ancestor(t)
-        @anchors[t["id"]] = anchor_struct(
-          "#{num}#{hiersep}#{c.increment(t).print}", nil,
-          t["inequality"] ? @labels["inequality"] : @labels["formula"],
-          "formula", t["unnumbered"]
-        )
+          @anchors[t["id"]] =
+            anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
+                          nil, @labels["table"], "table", t["unnumbered"])
+        end
       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|
+      def hierarchical_asset_names(clause, num)
+        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"])
+      end
-        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_formula_names(clause, num)
+        c = Counter.new
+        clause.xpath(ns(".//formula")).reject do |n|
+          blank?(n["id"])
+        end.each do |t|
+          @anchors[t["id"]] = anchor_struct(
+            "#{num}#{hiersep}#{c.increment(t).print}", nil,
+            t["inequality"] ? @labels["inequality"] : @labels["formula"],
+            "formula", t["unnumbered"]
+          )
+        end
       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"])
-    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)
+        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|
+      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"])
+      end
-        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_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)
+        end
       end
     end
   end