isodoc 1.7.4 → 1.7.7

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -1,133 +1,144 @@
-module IsoDoc::WordFunction
-  module Postprocess
-    def word_preface(docxml)
-      word_cover(docxml) if @wordcoverpage
-      word_intro(docxml, @wordToClevels) if @wordintropage
-    end
+module IsoDoc
+  module WordFunction
+    module Postprocess
+      def word_preface(docxml)
+        word_cover(docxml) if @wordcoverpage
+        word_intro(docxml, @wordToClevels) if @wordintropage
+      end
 
-    def word_cover(docxml)
-      cover = File.read(@wordcoverpage, encoding: "UTF-8")
-      cover = populate_template(cover, :word)
-      coverxml = to_word_xhtml_fragment(cover)
-      docxml.at('//div[@class="WordSection1"]').children.first.previous =
-        coverxml.to_xml(encoding: "US-ASCII")
-    end
+      def word_cover(docxml)
+        cover = File.read(@wordcoverpage, encoding: "UTF-8")
+        cover = populate_template(cover, :word)
+        coverxml = to_word_xhtml_fragment(cover)
+        docxml.at('//div[@class="WordSection1"]').children.first.previous =
+          coverxml.to_xml(encoding: "US-ASCII")
+      end
 
-    def word_intro(docxml, level)
-      intro = insert_toc(File.read(@wordintropage, encoding: "UTF-8"),
-                         docxml, level)
-      intro = populate_template(intro, :word)
-      introxml = to_word_xhtml_fragment(intro)
-      docxml.at('//div[@class="WordSection2"]').children.first.previous =
-        introxml.to_xml(encoding: "US-ASCII")
-    end
+      def word_intro(docxml, level)
+        intro = insert_toc(File.read(@wordintropage, encoding: "UTF-8"),
+                           docxml, level)
+        intro = populate_template(intro, :word)
+        introxml = to_word_xhtml_fragment(intro)
+        docxml.at('//div[@class="WordSection2"]').children.first.previous =
+          introxml.to_xml(encoding: "US-ASCII")
+      end
 
-    def insert_toc(intro, docxml, level)
-      intro.sub(/WORDTOC/, make_WordToC(docxml, level))
-    end
+      def insert_toc(intro, docxml, level)
+        intro.sub(/WORDTOC/, make_WordToC(docxml, level))
+      end
 
-    def word_toc_entry(toclevel, heading)
-      bookmark = bookmarkid # Random.rand(1000000000)
-      <<~TOC
-        <p class="MsoToc#{toclevel}"><span class="MsoHyperlink"><span
-        lang="EN-GB" style='mso-no-proof:yes'>
-        <a href="#_Toc#{bookmark}">#{heading}<span lang="EN-GB"
-        class="MsoTocTextSpan">
-        <span style='mso-tab-count:1 dotted'>. </span>
-        </span><span lang="EN-GB" class="MsoTocTextSpan">
-        <span style='mso-element:field-begin'></span></span>
-        <span lang="EN-GB"
-        class="MsoTocTextSpan"> PAGEREF _Toc#{bookmark} \\h </span>
-          <span lang="EN-GB" class="MsoTocTextSpan"><span
-          style='mso-element:field-separator'></span></span><span
-          lang="EN-GB" class="MsoTocTextSpan">1</span>
+      def word_toc_entry(toclevel, heading)
+        bookmark = bookmarkid # Random.rand(1000000000)
+        <<~TOC
+          <p class="MsoToc#{toclevel}"><span class="MsoHyperlink"><span
+          lang="EN-GB" style='mso-no-proof:yes'>
+          <a href="#_Toc#{bookmark}">#{heading}<span lang="EN-GB"
+          class="MsoTocTextSpan">
+          <span style='mso-tab-count:1 dotted'>. </span>
+          </span><span lang="EN-GB" class="MsoTocTextSpan">
+          <span style='mso-element:field-begin'></span></span>
           <span lang="EN-GB"
-          class="MsoTocTextSpan"></span><span
-          lang="EN-GB" class="MsoTocTextSpan"><span
-          style='mso-element:field-end'></span></span></a></span></span></p>
+          class="MsoTocTextSpan"> PAGEREF _Toc#{bookmark} \\h </span>
+            <span lang="EN-GB" class="MsoTocTextSpan"><span
+            style='mso-element:field-separator'></span></span><span
+            lang="EN-GB" class="MsoTocTextSpan">1</span>
+            <span lang="EN-GB"
+            class="MsoTocTextSpan"></span><span
+            lang="EN-GB" class="MsoTocTextSpan"><span
+            style='mso-element:field-end'></span></span></a></span></span></p>
 
-      TOC
-    end
+        TOC
+      end
 
-    def word_toc_preface(level)
-      <<~TOC.freeze
-      <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\o &quot;1-#{level}&quot; \\h \\z \\u <span
-        style='mso-element:field-separator'></span></span>
+      def word_toc_preface(level)
+        <<~TOC.freeze
+          <span lang="EN-GB"><span
+            style='mso-element:field-begin'></span><span
+            style='mso-spacerun:yes'>&#xA0;</span>TOC
+            \\o &quot;1-#{level}&quot; \\h \\z \\u <span
+            style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
+      WORD_TOC_SUFFIX1 = <<~TOC.freeze
+        <p class="MsoToc1"><span lang="EN-GB"><span
+          style='mso-element:field-end'></span></span><span
+          lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
       TOC
-    end
 
-    WORD_TOC_SUFFIX1 = <<~TOC.freeze
-      <p class="MsoToc1"><span lang="EN-GB"><span
-        style='mso-element:field-end'></span></span><span
-        lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
-    TOC
-
-    def make_WordToC(docxml, level)
-      toc = ""
-      #docxml.xpath("//h1 | //h2[not(ancestor::*[@class = 'Section3'])]").
-      xpath = (1..level).each.map { |i| "//h#{i}" }.join (" | ")
-      docxml.xpath(xpath).each do |h|
-        toc += word_toc_entry(h.name[1].to_i, header_strip(h))
+      def make_WordToC(docxml, level)
+        toc = ""
+        # docxml.xpath("//h1 | //h2[not(ancestor::*[@class = 'Section3'])]").
+        xpath = (1..level).each.map { |i| "//h#{i}" }.join (" | ")
+        docxml.xpath(xpath).each do |h|
+          toc += word_toc_entry(h.name[1].to_i, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{word_toc_preface(level)}}) + WORD_TOC_SUFFIX1
       end
-      toc.sub(/(<p class="MsoToc1">)/,
-              %{\\1#{word_toc_preface(level)}}) +  WORD_TOC_SUFFIX1
-    end
 
-    def authority_cleanup1(docxml, klass)
-      dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
-      auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or @class = 'boilerplate-#{klass}']")
-      auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each { |h| h.remove }
-      auth&.xpath(".//h1 | .//h2")&.each do |h|
-        h.name = "p"
-        h["class"] = "TitlePageSubhead"
+      def authority_cleanup1(docxml, klass)
+        dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
+        auth = docxml.at("//div[@id = 'boilerplate-#{klass}' "\
+                         "or @class = 'boilerplate-#{klass}']")
+        auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each(&:remove)
+        auth&.xpath(".//h1 | .//h2")&.each do |h|
+          h.name = "p"
+          h["class"] = "TitlePageSubhead"
+        end
+        dest and auth and dest.replace(auth.remove)
       end
-      dest and auth and dest.replace(auth.remove)
-    end
 
-    def authority_cleanup(docxml)
-      %w(copyright license legal feedback).each do |t|
-        authority_cleanup1(docxml, t)
+      def authority_cleanup(docxml)
+        %w(copyright license legal feedback).each do |t|
+          authority_cleanup1(docxml, t)
+        end
       end
-    end
 
-    def generate_header(filename, _dir)
-      return nil unless @header
-      template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
-      meta = @meta.get.merge(@labels ? { labels: @labels } : {}).merge(@meta.labels ? { labels: @meta.labels } : {})
-      meta[:filename] = filename
-      params = meta.map { |k, v| [k.to_s, v] }.to_h
-      Tempfile.open(%w(header html), :encoding => "utf-8") do |f|
-        f.write(template.render(params))
-        f
+      def generate_header(filename, _dir)
+        return nil unless @header
+
+        template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
+        meta = @meta.get.merge(@labels ? { labels: @labels } : {})
+          .merge(@meta.labels ? { labels: @meta.labels } : {})
+        meta[:filename] = filename
+        params = meta.transform_keys(&:to_s)
+        Tempfile.open(%w(header html), encoding: "utf-8") do |f|
+          f.write(template.render(params))
+          f
+        end
       end
-    end
 
-    def word_section_breaks(docxml)
-      @landscapestyle = ""
-      word_section_breaks1(docxml, "WordSection2")
-      word_section_breaks1(docxml, "WordSection3")
-      word_remove_pb_before_annex(docxml)
-      docxml.xpath("//br[@orientation]").each { |br| br.delete("orientation") }
-    end
+      def word_section_breaks(docxml)
+        @landscapestyle = ""
+        word_section_breaks1(docxml, "WordSection2")
+        word_section_breaks1(docxml, "WordSection3")
+        word_remove_pb_before_annex(docxml)
+        docxml.xpath("//br[@orientation]").each do |br|
+          br.delete("orientation")
+        end
+      end
 
-    def word_section_breaks1(docxml, sect)
-      docxml.xpath("//div[@class = '#{sect}']//br[@orientation]").reverse.
-        each_with_index do |br, i|
-        @landscapestyle += "\ndiv.#{sect}_#{i} {page:#{sect}#{br["orientation"] == "landscape" ? "L" : "P"};}\n"
-        split_at_section_break(docxml, sect, br, i)
+      def word_section_breaks1(docxml, sect)
+        docxml.xpath("//div[@class = '#{sect}']//br[@orientation]").reverse
+          .each_with_index do |br, i|
+          @landscapestyle +=
+            "\ndiv.#{sect}_#{i} {page:#{sect}"\
+            "#{br['orientation'] == 'landscape' ? 'L' : 'P'};}\n"
+          split_at_section_break(docxml, sect, br, i)
+        end
       end
-    end
 
-    def split_at_section_break(docxml, sect, br, i)
-      move = br.parent.xpath("following::node()") &
-        br.document.xpath("//div[@class = '#{sect}']//*")
-      ins = docxml.at("//div[@class = '#{sect}']").after("<div class='#{sect}_#{i}'/>").next_element
-      move.each do |m|
-        next if m.at("./ancestor::div[@class = '#{sect}_#{i}']")
-        ins << m.remove
+      def split_at_section_break(docxml, sect, brk, idx)
+        move = brk.parent.xpath("following::node()") &
+          brk.document.xpath("//div[@class = '#{sect}']//*")
+        ins = docxml.at("//div[@class = '#{sect}']")
+          .after("<div class='#{sect}_#{idx}'/>").next_element
+        move.each do |m|
+          next if m.at("./ancestor::div[@class = '#{sect}_#{idx}']")
+
+          ins << m.remove
+        end
       end
     end
   end

data/lib/isodoc/xref/xref_gen.rb

@@ -1,198 +1,201 @@
 require_relative "xref_gen_seq"
 
-module IsoDoc::XrefGen
-  module Blocks
-    NUMBERED_BLOCKS = %w(termnote termexample note example requirement
-                         recommendation permission figure table formula admonition sourcecode).freeze
-
-    def amend_preprocess(xmldoc)
-      xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
-        autonum = amend_autonums(a)
-        NUMBERED_BLOCKS.each do |b|
-          a.xpath(ns("./newcontent//#{b}")).each_with_index do |e, i|
-            autonum[b] && i.zero? and e["number"] = autonum[b]
-            !autonum[b] and e["unnumbered"] = "true"
+module IsoDoc
+  module XrefGen
+    module Blocks
+      NUMBERED_BLOCKS = %w(termnote termexample note example requirement
+                           recommendation permission figure table formula
+                           admonition sourcecode).freeze
+
+      def amend_preprocess(xmldoc)
+        xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
+          autonum = amend_autonums(a)
+          NUMBERED_BLOCKS.each do |b|
+            a.xpath(ns("./newcontent//#{b}")).each_with_index do |e, i|
+              autonum[b] && i.zero? and e["number"] = autonum[b]
+              !autonum[b] and e["unnumbered"] = "true"
+            end
           end
         end
       end
-    end
 
-    def amend_autonums(amend)
-      autonum = {}
-      amend.xpath(ns("./autonumber")).each do |n|
-        autonum[n["type"]] = n.text
+      def amend_autonums(amend)
+        autonum = {}
+        amend.xpath(ns("./autonumber")).each do |n|
+          autonum[n["type"]] = n.text
+        end
+        autonum
       end
-      autonum
-    end
-
-    def termnote_label(note)
-      @labels["termnote"].gsub(/%/, note.to_s)
-    end
 
-    def increment_label(elems, node, counter, increment = true)
-      return "" if elems.size == 1 && !node["number"]
+      def termnote_label(note)
+        @labels["termnote"].gsub(/%/, note.to_s)
+      end
 
-      counter.increment(node) if increment
-      " #{counter.print}"
-    end
+      def increment_label(elems, node, counter, increment = true)
+        return "" if elems.size == 1 && !node["number"]
 
-    def termnote_anchor_names(docxml)
-      docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
-        c = Counter.new
-        t.xpath(ns(".//termnote")).each do |n|
-          next if n["id"].nil? || n["id"].empty?
+        counter.increment(node) if increment
+        " #{counter.print}"
+      end
 
-          c.increment(n)
-          @anchors[n["id"]] =
-            { label: termnote_label(c.print), type: "termnote", value: c.print,
-              xref: l10n("#{anchor(t['id'], :xref)}, "\
-                         "#{@labels['note_xref']} #{c.print}") }
+      def termnote_anchor_names(docxml)
+        docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
+          c = Counter.new
+          t.xpath(ns(".//termnote")).each do |n|
+            next if n["id"].nil? || n["id"].empty?
+
+            c.increment(n)
+            @anchors[n["id"]] =
+              { label: termnote_label(c.print), type: "termnote", value: c.print,
+                xref: l10n("#{anchor(t['id'], :xref)}, "\
+                           "#{@labels['note_xref']} #{c.print}") }
+          end
         end
       end
-    end
 
-    def termexample_anchor_names(docxml)
-      docxml.xpath(ns("//term[descendant::termexample]")).each do |t|
-        examples = t.xpath(ns(".//termexample"))
-        c = Counter.new
-        examples.each do |n|
-          next if n["id"].nil? || n["id"].empty?
-
-          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}") }
+      def termexample_anchor_names(docxml)
+        docxml.xpath(ns("//term[descendant::termexample]")).each do |t|
+          examples = t.xpath(ns(".//termexample"))
+          c = Counter.new
+          examples.each do |n|
+            next if n["id"].nil? || n["id"].empty?
+
+            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}") }
+          end
         end
       end
-    end
 
-    SECTIONS_XPATH =
-      "//foreword | //introduction | //acknowledgements | //preface/clause | "\
-      "//preface/terms | preface/definitions | preface/references | "\
-      "//sections/terms | //annex | "\
-      "//sections/clause | //sections/definitions | "\
-      "//bibliography/references | //bibliography/clause".freeze
+      SECTIONS_XPATH =
+        "//foreword | //introduction | //acknowledgements | "\
+        "//preface/terms | preface/definitions | preface/references | "\
+        "//preface/clause | //sections/terms | //annex | "\
+        "//sections/clause | //sections/definitions | "\
+        "//bibliography/references | //bibliography/clause".freeze
 
-    def sections_xpath
-      SECTIONS_XPATH
-    end
+      def sections_xpath
+        SECTIONS_XPATH
+      end
 
-    CHILD_NOTES_XPATH =
-      "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
-      "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:note | "\
-      "./xmlns:note".freeze
+      CHILD_NOTES_XPATH =
+        "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
+        "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:note | "\
+        "./xmlns:note".freeze
 
-    def note_anchor_names(sections)
-      sections.each do |s|
-        c = Counter.new
-        (notes = s.xpath(CHILD_NOTES_XPATH)).each do |n|
-          next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
+      def note_anchor_names(sections)
+        sections.each do |s|
+          c = Counter.new
+          (notes = s.xpath(CHILD_NOTES_XPATH)).each do |n|
+            next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
-          @anchors[n["id"]] =
-            anchor_struct(increment_label(notes, n, c), n,
-                          @labels["note_xref"], "note", false)
+            @anchors[n["id"]] =
+              anchor_struct(increment_label(notes, n, c), n,
+                            @labels["note_xref"], "note", false)
+          end
+          note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
-        note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
-    end
 
-    CHILD_EXAMPLES_XPATH =
-      "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
-      "not(self::xmlns:terms) and not(self::xmlns:definitions)]//"\
-      "xmlns:example | ./xmlns:example".freeze
+      CHILD_EXAMPLES_XPATH =
+        "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
+        "not(self::xmlns:terms) and not(self::xmlns:definitions)]//"\
+        "xmlns:example | ./xmlns:example".freeze
 
-    CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | "\
-      "./references".freeze
+      CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | "\
+                       "./references".freeze
 
-    def example_anchor_names(sections)
-      sections.each do |s|
-        c = Counter.new
-        (notes = s.xpath(CHILD_EXAMPLES_XPATH)).each do |n|
-          next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
+      def example_anchor_names(sections)
+        sections.each do |s|
+          c = Counter.new
+          (notes = s.xpath(CHILD_EXAMPLES_XPATH)).each do |n|
+            next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
-          @anchors[n["id"]] =
-            anchor_struct(increment_label(notes, n, c), n,
-                          @labels["example_xref"], "example", n["unnumbered"])
+            @anchors[n["id"]] =
+              anchor_struct(increment_label(notes, n, c), n,
+                            @labels["example_xref"], "example", n["unnumbered"])
+          end
+          example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
-        example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
-    end
-
-    def list_anchor_names(sections)
-      sections.each do |s|
-        notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
-          s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
-        c = Counter.new
-        notes.each do |n|
-          next if n["id"].nil? || n["id"].empty?
 
-          @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
-                                            @labels["list"], "list", false)
-          list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
+      def list_anchor_names(sections)
+        sections.each do |s|
+          notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
+            s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
+          c = Counter.new
+          notes.each do |n|
+            next if n["id"].nil? || n["id"].empty?
+
+            @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
+                                              @labels["list"], "list", false)
+            list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
+          end
+          list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
-        list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
-    end
 
-    def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
-      c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
-      list.xpath(ns("./li")).each do |li|
-        label = c.increment(li).listlabel(list, depth)
-        label = "#{prev_label}.#{label}" unless prev_label.empty?
-        label = "#{list_anchor[:xref]} #{label}" if refer_list
-        li["id"] and @anchors[li["id"]] =
-                       { xref: "#{label})", type: "listitem",
-                         container: list_anchor[:container] }
-        li.xpath(ns("./ol")).each do |ol|
-          list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
+      def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
+        c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
+        list.xpath(ns("./li")).each do |li|
+          label = c.increment(li).listlabel(list, depth)
+          label = "#{prev_label}.#{label}" unless prev_label.empty?
+          label = "#{list_anchor[:xref]} #{label}" if refer_list
+          li["id"] and @anchors[li["id"]] =
+                         { xref: "#{label})", type: "listitem",
+                           container: list_anchor[:container] }
+          li.xpath(ns("./ol")).each do |ol|
+            list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
+          end
         end
       end
-    end
 
-    def deflist_anchor_names(sections)
-      sections.each do |s|
-        notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
-          s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
-        c = Counter.new
-        notes.each do |n|
-          next if n["id"].nil? || n["id"].empty?
-
-          @anchors[n["id"]] =
-            anchor_struct(increment_label(notes, n, c), n,
-                          @labels["deflist"], "deflist", false)
-          deflist_term_anchor_names(n, @anchors[n["id"]])
+      def deflist_anchor_names(sections)
+        sections.each do |s|
+          notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
+            s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
+          c = Counter.new
+          notes.each do |n|
+            next if n["id"].nil? || n["id"].empty?
+
+            @anchors[n["id"]] =
+              anchor_struct(increment_label(notes, n, c), n,
+                            @labels["deflist"], "deflist", false)
+            deflist_term_anchor_names(n, @anchors[n["id"]])
+          end
+          deflist_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
-        deflist_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
-    end
 
-    def deflist_term_anchor_names(list, list_anchor)
-      list.xpath(ns("./dt")).each do |li|
-        label = li.text
-        label = l10n("#{list_anchor[:xref]}: #{label}")
-        li["id"] and @anchors[li["id"]] =
-                       { xref: label, type: "deflistitem",
-                         container: list_anchor[:container] }
-        li.xpath(ns("./dl")).each do |dl|
-          deflist_term_anchor_names(dl, list_anchor)
+      def deflist_term_anchor_names(list, list_anchor)
+        list.xpath(ns("./dt")).each do |li|
+          label = li.text
+          label = l10n("#{list_anchor[:xref]}: #{label}")
+          li["id"] and @anchors[li["id"]] =
+                         { xref: label, type: "deflistitem",
+                           container: list_anchor[:container] }
+          li.xpath(ns("./dl")).each do |dl|
+            deflist_term_anchor_names(dl, list_anchor)
+          end
         end
       end
-    end
 
-    def bookmark_anchor_names(docxml)
-      docxml.xpath(ns(".//bookmark")).each do |n|
-        next if n["id"].nil? || n["id"].empty?
+      def bookmark_anchor_names(docxml)
+        docxml.xpath(ns(".//bookmark")).each do |n|
+          next if n["id"].nil? || n["id"].empty?
 
-        parent = nil
-        n.ancestors.each do |a|
-          next unless a["id"] && parent = @anchors.dig(a["id"], :xref)
+          parent = nil
+          n.ancestors.each do |a|
+            next unless a["id"] && parent = @anchors.dig(a["id"], :xref)
 
-          break
+            break
+          end
+          @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,
+                                xref: parent || "???" }
         end
-        @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,
-                              xref: parent || "???" }
       end
     end
   end