isodoc 0.9.23 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20dbfc64f7e410c4f6bf45d258e8d96be1cc0937203fdd7615e8fa41b38991a8
-  data.tar.gz: e24800713e0e575c04caae609024007aef26d398a805dbfada61876a013a4208
+  metadata.gz: 01ea09cdb8f862493ac3faba65edeed830efbea957055ca689fc61e2d878e20f
+  data.tar.gz: b523e1a7821627a7ad098a1b777dfec1c63c5c46b3d263d05a9f1c67bfdf1405
 SHA512:
-  metadata.gz: a91d1ae2d6816fa2b9b499b56b8990bf609853941fe5fd14b6e9d262596096417f1e24c0e4596f81a637a4192c9fe7c2aea4430dad804a14fa9b556cd18dcac1
-  data.tar.gz: 50603622fbf203a4d2d66ecd1f8028f1abb04e5c925770cce6f96fc4a144ed014766a4a57729f3ec912a89156d37277fb31c4a004e804fa49bd0e6abc6194862
+  metadata.gz: de9f3a9943ae506820164db1d009fa6541320879a8e9921c4509a94789a64b0568ce5211a1e6e9e02a861024a2bd733b34fca2fc1acca0c7ae4af34618d6878f
+  data.tar.gz: a698d0d759b6dd3b26ed9d325fdd894a244dd1130cd54a5dac1b216ff1bb0bb4f9719af8c0135f2d93f1e932eca5248a7adbad5ddb305109ed52297b0b450c47

data/.travis.yml

@@ -1,3 +1,5 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
 language: ruby
 cache: bundler
 os:
@@ -6,11 +8,11 @@ os:
 rvm:
 - 2.5
 - 2.4
-- 2.3
 - ruby-head
-before_install:
+before_install: 
 - nvm install 8
 - npm install -g puppeteer
+- npm install
 - gem install bundler -v 2.0.1
 - bundle update
 matrix:

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.23)
+    isodoc (0.10.0)
       asciimath
-      html2doc (~> 0.8.6)
+      html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
       liquid
       metanorma (~> 0.3.0)
       nokogiri (>= 1)
       rake (~> 12.0)
       roman-numerals
-      sassc (~> 1.12.1)
+      sassc (~> 2)
       thread_safe
       uuidtools
 
 GEM
   remote: https://rubygems.org/
   specs:
-    asciidoctor (2.0.9)
+    asciidoctor (2.0.10)
     asciimath (1.0.8)
     ast (2.4.0)
     byebug (9.1.0)
     coderay (1.1.2)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    ffi (1.9.25)
+    ffi (1.11.1)
     formatador (0.2.5)
     guard (2.15.0)
       formatador (>= 0.2.4)
@@ -42,7 +42,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.10)
+    html2doc (0.8.11)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
@@ -51,7 +51,7 @@ GEM
       thread_safe
       uuidtools
     htmlentities (4.3.4)
-    image_size (2.0.0)
+    image_size (2.0.1)
     json (2.2.0)
     liquid (4.0.3)
     listen (3.1.5)
@@ -90,15 +90,15 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.1)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     rubocop (0.54.0)
       parallel (~> 1.10)
       parser (>= 2.5)
@@ -106,16 +106,11 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
+    ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sassc (1.12.1)
-      ffi (~> 1.9.6)
-      sass (>= 3.3.0)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
     shellany (0.0.1)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -125,7 +120,7 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
     uuidtools (2.1.5)
 
 PLATFORMS

data/appveyor.yml

@@ -1,10 +1,14 @@
+# Auto-generated !!! Do not edit it manually
+# use ci-master https://github.com/metanorma/metanorma-build-scripts
 version: '{build}'
 
+cache:
+  - vendor/bundle
+
 environment:
   matrix:
     - RUBY_VERSION: 25
     - RUBY_VERSION: 24
-    - RUBY_VERSION: 23
     - RUBY_VERSION: _trunk
 
 matrix:
@@ -17,6 +21,8 @@ install:
 
 build_script:
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - set GIT_TERMINAL_PROMPT=0
+  - bundle config --local path vendor/bundle
   - bundle update
   - bundle install
 
@@ -27,4 +33,3 @@ before_test:
 
 test_script:
   - bundle exec rake
-

data/isodoc.gemspec

@@ -26,17 +26,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "asciimath"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri", ">= 1"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "html2doc", "~> 0.8.6"
+  spec.add_dependency "html2doc", "~> 0.8.11"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
-  spec.add_dependency "sassc", "~> 1.12.1"
+  spec.add_dependency "sassc", "~> 2"
   spec.add_dependency "metanorma", "~> 0.3.0"
   spec.add_dependency "rake", "~> 12.0"
 

data/lib/isodoc/function/blocks.rb

@@ -44,11 +44,16 @@ module IsoDoc::Function
     def figure_name_parse(node, div, name)
       return if name.nil? && node.at(ns("./figure"))
       div.p **{ class: "FigureTitle", align: "center" } do |p|
-        p << l10n("#{@figure_lbl} #{get_anchors[node['id']][:label]}")
-        if name
+        lbl = anchor(node['id'], :label, false)
+        lbl.nil? or p << l10n("#{@figure_lbl} #{lbl}")
+        name and !lbl.nil? and p << "&nbsp;&mdash; "
+=begin
+        get_anchors[node['id']][:label].nil? or
+          p << l10n("#{@figure_lbl} #{get_anchors[node['id']][:label]}")
+        name and !get_anchors[node['id']][:label].nil? and
           p << "&nbsp;&mdash; "
-          name.children.each { |n| parse(n, div) }
-        end
+=end
+        name and name.children.each { |n| parse(n, div) }
       end
     end
 
@@ -73,7 +78,7 @@ module IsoDoc::Function
 
     def example_label(node)
       n = get_anchors[node["id"]]
-      return @example_lbl if n.nil? || n[:label].empty?
+      return @example_lbl if n.nil? || n[:label].nil? || n[:label].empty?
       l10n("#{@example_lbl} #{n[:label]}")
     end
 
@@ -118,7 +123,7 @@ module IsoDoc::Function
 
     def sourcecode_name_parse(_node, div, name)
       div.p **{ class: "SourceTitle", align: "center" } do |p|
-          name.children.each { |n| parse(n, p) }
+        name.children.each { |n| parse(n, p) }
       end
     end
 
@@ -187,8 +192,13 @@ module IsoDoc::Function
       out.div **attr_code(id: node["id"], class: "formula") do |div|
         div.p do |p|
           parse(node.at(ns("./stem")), div)
-          insert_tab(div, 1)
-          div << "(#{get_anchors[node['id']][:label]})"
+          lbl = anchor(node['id'], :label, false)
+          #unless get_anchors[node['id']][:label].nil?
+          unless lbl.nil?
+            insert_tab(div, 1)
+            #div << "(#{get_anchors[node['id']][:label]})"
+            div << "(#{lbl})"
+          end
         end
       end
     end
@@ -266,7 +276,10 @@ module IsoDoc::Function
       label = node.at(ns("./label"))
       title = node.at(ns("./title"))
       out.p **{ class: "AdmonitionTitle" }  do |b|
-        b << l10n("#{type} #{get_anchors[node['id']][:label]}:")
+        lbl = anchor(node['id'], :label, false)
+        lbl.nil? or b << l10n("#{type} #{lbl}:")
+        #get_anchors[node['id']][:label].nil? or
+          #b << l10n("#{type} #{get_anchors[node['id']][:label]}:")
         if label || title
           b.br
           label and label.children.each { |n| parse(n,b) }

data/lib/isodoc/function/inline.rb

@@ -23,20 +23,25 @@ module IsoDoc::Function
     end
 
     def prefix_container(container, linkend, _target)
-      l10n(get_anchors[container][:xref] + ", " + linkend)
+      #l10n(get_anchors[container][:xref] + ", " + linkend)
+      l10n(anchor(container, :xref) + ", " + linkend)
     end
 
     def anchor_linkend(node, linkend)
-      if node["citeas"].nil? && node["bibitemid"] &&
-          get_anchors.has_key?(node["bibitemid"])
-        return get_anchors.dig(node["bibitemid"] ,:xref)
-      elsif node["target"] && get_anchors.has_key?(node["target"])
-        linkend = get_anchors[node["target"]][:xref]
-        container = get_anchors[node["target"]][:container]
+      if node["citeas"].nil? && node["bibitemid"] #&&
+          #get_anchors.has_key?(node["bibitemid"])
+        #return get_anchors.dig(node["bibitemid"] ,:xref)
+        return anchor(node["bibitemid"] ,:xref) || "???"
+      #elsif node["target"] && get_anchors.has_key?(node["target"])
+      elsif node["target"] && !/.#./.match(node["target"])
+        #linkend = get_anchors[node["target"]][:xref]
+        linkend = anchor(node["target"], :xref)
+        #container = get_anchors[node["target"]][:container]
+        container = anchor(node["target"], :container, false)
         (container && get_note_container_id(node) != container) &&
           linkend = prefix_container(container, linkend, node["target"])
       end
-      linkend
+      linkend || "???"
     end
 
     def get_linkend(node)

data/lib/isodoc/function/references.rb

@@ -200,7 +200,7 @@ module IsoDoc::Function
       prefix = ref.at(ns("./docidentifier/@type"))
       # return ref_names(ref) unless docid
       date = ref.at(ns("./date[@type = 'published']"))
-      allparts = ref.at(ns("./allparts"))
+      allparts = ref.at(ns("./extent[@type='part'][referenceFrom='all']"))
       reference = format_ref(docid_l10n(docid.text), prefix&.text, isopub, date, allparts)
       @anchors[ref["id"]] = { xref: reference }
     end

data/lib/isodoc/function/section.rb

@@ -8,8 +8,10 @@ module IsoDoc::Function
       title = c1&.content || ""
       out.span **{ class: "zzMoveToFollowing" } do |s|
         s.b do |b|
-          if get_anchors[node['id']][:label] && !@suppressheadingnumbers
-            b << "#{get_anchors[node['id']][:label]}#{clausedelim} "
+          #if get_anchors[node['id']][:label] && !@suppressheadingnumbers
+          if anchor(node['id'], :label, false) && !@suppressheadingnumbers
+            #b << "#{get_anchors[node['id']][:label]}#{clausedelim} "
+            b << "#{anchor(node['id'], :label)}#{clausedelim} "
           end
           b << "#{title} "
         end
@@ -20,8 +22,10 @@ module IsoDoc::Function
       if node["inline-header"] == "true"
         inline_header_title(out, node, c1)
       else
-        div.send "h#{get_anchors[node['id']][:level]}" do |h|
-          lbl = get_anchors[node['id']][:label]
+        #div.send "h#{get_anchors[node['id']][:level]}" do |h|
+        div.send "h#{anchor(node['id'], :level) || '1'}" do |h|
+          #lbl = get_anchors[node['id']][:label]
+          lbl = anchor(node['id'], :label, false)
           h << "#{lbl}#{clausedelim} " if lbl && !@suppressheadingnumbers
           c1&.children&.each { |c2| parse(c2, h) }
         end
@@ -56,7 +60,8 @@ module IsoDoc::Function
     def clause(isoxml, out)
       isoxml.xpath(ns(self.class::MIDDLE_CLAUSE)).each do |c|
         out.div **attr_code(id: c["id"]) do |s|
-          clause_name(get_anchors[c['id']][:label],
+          #clause_name(get_anchors[c['id']][:label],
+          clause_name(anchor(c['id'], :label),
                       c&.at(ns("./title"))&.content, s, nil)
           c.elements.reject { |c1| c1.name == "title" }.each do |c1|
             parse(c1, s)
@@ -67,7 +72,8 @@ module IsoDoc::Function
 
     def annex_name(annex, name, div)
       div.h1 **{ class: "Annex" } do |t|
-        t << "#{get_anchors[annex['id']][:label]}<br/><br/>"
+        #t << "#{get_anchors[annex['id']][:label]}<br/><br/>"
+        t << "#{anchor(annex['id'], :label)}<br/><br/>"
         t.b do |b|
           name&.children&.each { |c2| parse(c2, b) }
         end
@@ -121,7 +127,7 @@ module IsoDoc::Function
 
     def term_defs_boilerplate_cont(src, term)
       sources = sentence_join(src.map do |s|
-        "<a href=##{s["bibitemid"]}>#{@anchors.dig(s["bibitemid"], :xref)}</a>" 
+        "<a href=##{s["bibitemid"]}>#{anchor(s["bibitemid"], :xref)}</a>" 
       end)
       if src.empty? then @internal_terms_boilerplate
       elsif term.nil? then external_terms_boilerplate(sources)

data/lib/isodoc/function/table.rb

@@ -4,11 +4,16 @@ module IsoDoc::Function
     def table_title_parse(node, out)
       name = node.at(ns("./name"))
       out.p **{ class: "TableTitle", align: "center" } do |p|
-        p << l10n("#{@table_lbl} #{get_anchors[node['id']][:label]}")
-        if name
+        lbl = anchor(node['id'], :label, false)
+        lbl.nil? or p << l10n("#{@table_lbl} #{lbl}")
+        name and !lbl.nil? and p << l10n("&nbsp;&mdash; ")
+=begin
+        get_anchors[node['id']][:label].nil? or
+          p << l10n("#{@table_lbl} #{get_anchors[node['id']][:label]}")
+        name and !get_anchors[node['id']][:label].nil? and
           p << l10n("&nbsp;&mdash; ")
-          name.children.each { |n| parse(n, p) }
-        end
+=end
+        name and name.children.each { |n| parse(n, p) }
       end
     end
 

data/lib/isodoc/function/terms.rb

@@ -43,8 +43,9 @@ module IsoDoc::Function
       out.div **{ class: "Note" } do |div|
         first = node.first_element_child
         div.p do |p|
-          anchor = get_anchors[node['id']]
-          p << "#{anchor&.dig(:label) || '???'}: "
+          #anchor = get_anchors[node['id']]
+          #p << "#{anchor&.dig(:label) || '???'}: "
+          p << "#{anchor(node['id'], :label) || '???'}: "
           para_then_remainder(first, node, p, div)
         end
       end

data/lib/isodoc/function/xref_gen.rb

@@ -9,6 +9,14 @@ module IsoDoc::Function
       @anchors
     end
 
+    def anchor(id, lbl, warning = true)
+      unless @anchors[id]
+        warning and warn "No label has been processed for ID #{id}"
+        return nil
+      end
+      @anchors.dig(id, lbl)
+    end
+
     def termnote_label(n)
       @termnote_lbl.gsub(/%/, n.to_s)
     end
@@ -20,7 +28,7 @@ module IsoDoc::Function
           @anchors[n["id"]] =
             { label: termnote_label(i + 1),
               type: "termnote",
-              xref: l10n("#{@anchors.dig(t['id'], :xref)}, "\
+              xref: l10n("#{anchor(t['id'], :xref)}, "\
                          "#{@note_xref_lbl} #{i + 1}") }
         end
       end
@@ -34,7 +42,7 @@ module IsoDoc::Function
           idx = examples.size == 1 ? "" : (i + 1).to_s
           @anchors[n["id"]] = {
             type: "termexample",
-            label: idx, xref: l10n("#{@anchors.dig(t['id'], :xref)}, "\
+            label: idx, xref: l10n("#{anchor(t['id'], :xref)}, "\
                                    "#{@note_xref_lbl} #{i + 1}") }
         end
       end
@@ -57,7 +65,7 @@ module IsoDoc::Function
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl, "note")
+          @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl, "note", false)
         end
         note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
@@ -73,12 +81,14 @@ module IsoDoc::Function
     def example_anchor_names(sections)
       sections.each do |s|
         notes = s.xpath(CHILD_EXAMPLES_XPATH)
-        notes.each_with_index do |n, i|
+        i = 0
+        notes.each do |n|
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
           @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl,
-                                            "example")
+                                            "example", n["unnumbered"])
+          i += 1 unless n["unnumbered"]
         end
         example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
@@ -91,7 +101,7 @@ module IsoDoc::Function
         notes.each_with_index do |n, i|
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl, "list")
+          @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl, "list", false)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
         list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -139,11 +149,11 @@ module IsoDoc::Function
         if t.parent.name == "figure" then j += 1
         else
           j = 0
-          i += 1
+          i += 1 unless t["unnumbered"]
         end
         label = i.to_s + (j.zero? ? "" : "-#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure")
+        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure", t["unnumbered"])
       end
     end
 
@@ -163,10 +173,10 @@ module IsoDoc::Function
       end
     end
 
-    def anchor_struct(lbl, container, elem, type)
+    def anchor_struct(lbl, container, elem, type, unnumbered = false)
       ret = {}
-      ret[:label] = anchor_struct_label(lbl, elem)
-      ret[:xref] = anchor_struct_xref(lbl, elem)
+      ret[:label] = unnumbered == "true" ? nil : anchor_struct_label(lbl, elem)
+      ret[:xref] = anchor_struct_xref(unnumbered == "true" ? "(??)" : lbl, elem)
       ret[:xref].gsub!(/ $/, "")
       ret[:container] = get_clause_id(container) unless container.nil?
       ret[:type] = type
@@ -174,81 +184,97 @@ module IsoDoc::Function
     end
 
     def sequential_table_names(clause)
-      clause.xpath(ns(".//table")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, nil, @table_lbl, "table")
+        @anchors[t["id"]] = anchor_struct(i + 1, nil, @table_lbl, "table", t["unnumbered"])
+        i += 1 unless t["unnumbered"]
       end
     end
 
     def sequential_formula_names(clause)
-      clause.xpath(ns(".//formula")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//formula")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, t, @formula_lbl, "formula")
+        @anchors[t["id"]] = anchor_struct(i + 1, t, @formula_lbl, "formula", t["unnumbered"])
+        i += 1 unless t["unnumbered"]
       end
     end
 
     FIRST_LVL_REQ = "[not(ancestor::permission or ancestor::requirement or ancestor::recommendation)]".freeze
 
     def sequential_permission_names(clause)
-      clause.xpath(ns(".//permission#{FIRST_LVL_REQ}")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//permission#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, t, @permission_lbl, "permission")
+        @anchors[t["id"]] = anchor_struct(i + 1, t, @permission_lbl, "permission", t["unnumbered"])
         sequential_permission_names1(t, i + 1)
         sequential_requirement_names1(t, i + 1)
         sequential_recommendation_names1(t, i + 1)
+        i += 1 unless t["unnumbered"]
       end
     end
 
     def sequential_permission_names1(block, lbl)
-      block.xpath(ns("./permission")).each_with_index do |t, i|
+      i = 0
+      block.xpath(ns("./permission")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         newlbl = "#{lbl}#{hierfigsep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(newlbl, t, @permission_lbl, "permission")
+        @anchors[t["id"]] = anchor_struct(newlbl, t, @permission_lbl, "permission", t["unnumbered"])
         sequential_permission_names1(t, newlbl)
         sequential_requirement_names1(t, newlbl)
         sequential_recommendation_names1(t, newlbl)
+        i += 1 unless t["unnumbered"]
       end
     end
 
     def sequential_requirement_names(clause)
-      clause.xpath(ns(".//requirement#{FIRST_LVL_REQ}")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//requirement#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, t, @requirement_lbl, "requirement")
+        @anchors[t["id"]] = anchor_struct(i + 1, t, @requirement_lbl, "requirement", t["unnumbered"])
         sequential_permission_names1(t, i + 1)
         sequential_requirement_names1(t, i + 1)
         sequential_recommendation_names1(t, i + 1)
+        i += 1 unless t["unnumbered"]
       end
     end
 
     def sequential_requirement_names1(block, lbl)
-      block.xpath(ns("./requirement")).each_with_index do |t, i|
+      i = 0
+      block.xpath(ns("./requirement")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         newlbl = "#{lbl}#{hierfigsep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(newlbl, t, @requirement_lbl, "requirement")
+        @anchors[t["id"]] = anchor_struct(newlbl, t, @requirement_lbl, "requirement", t["unnumbered"])
         sequential_permission_names1(t, newlbl)
         sequential_requirement_names1(t, newlbl)
         sequential_recommendation_names1(t, newlbl)
+        i += 1 unless t["unnumbered"]
       end
     end
 
     def sequential_recommendation_names(clause)
-      clause.xpath(ns(".//recommendation#{FIRST_LVL_REQ}")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//recommendation#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, t, @recommendation_lbl, "recommendation")
+        @anchors[t["id"]] = anchor_struct(i + 1, t, @recommendation_lbl, "recommendation", t["unnumbered"])
         sequential_permission_names1(t, i + 1)
         sequential_requirement_names1(t, i + 1)
         sequential_recommendation_names1(t, i + 1)
+        i += 1 unless t["unnumbered"]
       end
     end
 
     def sequential_recommendation_names1(block, lbl)
-      block.xpath(ns("./recommendation")).each_with_index do |t, i|
+      i = 0
+      block.xpath(ns("./recommendation")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         newlbl = "#{lbl}#{hierfigsep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(newlbl, t, @recommendation_lbl, "recommendation")
+        @anchors[t["id"]] = anchor_struct(newlbl, t, @recommendation_lbl, "recommendation", t["unnumbered"])
         sequential_permission_names1(t, newlbl)
         sequential_requirement_names1(t, newlbl)
         sequential_recommendation_names1(t, newlbl)
+        i += 1 unless t["unnumbered"]
       end
     end
 
@@ -275,19 +301,21 @@ module IsoDoc::Function
         if t.parent.name == "figure" then j += 1
         else
           j = 0
-          i += 1
+          i += 1 unless t["unnumbered"]
         end
         label = "#{num}#{hiersep}#{i}" + (j.zero? ? "" : "#{hierfigsep}#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure")
+        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure", t["unnumbered"])
       end
     end
 
     def hierarchical_table_names(clause, num)
-      clause.xpath(ns(".//table")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct("#{num}#{hiersep}#{i + 1}",
-                                          nil, @table_lbl, "table")
+                                          nil, @table_lbl, "table", t["unnumbered"])
+        i += 1 unless t["unnumbered"]
       end
     end
 
@@ -301,43 +329,51 @@ module IsoDoc::Function
     end
 
     def hierarchical_formula_names(clause, num)
-      clause.xpath(ns(".//formula")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//formula")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct("#{num}#{hiersep}#{i + 1}",
-                                          t, @formula_lbl, "formula")
+                                          t, @formula_lbl, "formula", t["unnumbered"])
+        i += 1 unless t["unnumbered"]
       end
     end
 
     def hierarchical_permission_names(clause, num)
-      clause.xpath(ns(".//permission#{FIRST_LVL_REQ}")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//permission#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         lbl = "#{num}#{hiersep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(lbl, t, @permission_lbl, "permission")
+        @anchors[t["id"]] = anchor_struct(lbl, t, @permission_lbl, "permission", t["unnumbered"])
         sequential_permission_names1(t, lbl)
         sequential_requirement_names1(t, lbl)
         sequential_recommendation_names1(t, lbl)
+        i += 1 unless t["unnumbered"]
       end
     end
 
     def hierarchical_requirement_names(clause, num)
-      clause.xpath(ns(".//requirement#{FIRST_LVL_REQ}")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//requirement#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         lbl = "#{num}#{hiersep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(lbl, t, @requirement_lbl, "requirement")
+        @anchors[t["id"]] = anchor_struct(lbl, t, @requirement_lbl, "requirement", t["unnumbered"])
         sequential_permission_names1(t, lbl)
         sequential_requirement_names1(t, lbl)
         sequential_recommendation_names1(t, lbl)
+        i += 1 unless t["unnumbered"]
       end
     end
 
     def hierarchical_recommendation_names(clause, num)
-      clause.xpath(ns(".//recommendation#{FIRST_LVL_REQ}")).each_with_index do |t, i|
+      i = 0
+      clause.xpath(ns(".//recommendation#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         lbl = "#{num}#{hiersep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(lbl, t, @recommendation_lbl, "recommendation")
+        @anchors[t["id"]] = anchor_struct(lbl, t, @recommendation_lbl, "recommendation", t["unnumbered"])
         sequential_permission_names1(t, lbl)
         sequential_requirement_names1(t, lbl)
         sequential_recommendation_names1(t, lbl)
+        i += 1 unless t["unnumbered"]
       end
     end
   end